diff options
Diffstat (limited to 'include/linux/nfsacl.h')
| -rw-r--r-- | include/linux/nfsacl.h | 27 | 
1 files changed, 3 insertions, 24 deletions
diff --git a/include/linux/nfsacl.h b/include/linux/nfsacl.h index f321b578ede..5e69e67b31a 100644 --- a/include/linux/nfsacl.h +++ b/include/linux/nfsacl.h @@ -6,30 +6,10 @@  #ifndef __LINUX_NFSACL_H  #define __LINUX_NFSACL_H -#define NFS_ACL_PROGRAM	100227 - -#define ACLPROC2_GETACL		1 -#define ACLPROC2_SETACL		2 -#define ACLPROC2_GETATTR	3 -#define ACLPROC2_ACCESS		4 - -#define ACLPROC3_GETACL		1 -#define ACLPROC3_SETACL		2 - - -/* Flags for the getacl/setacl mode */ -#define NFS_ACL			0x0001 -#define NFS_ACLCNT		0x0002 -#define NFS_DFACL		0x0004 -#define NFS_DFACLCNT		0x0008 - -/* Flag for Default ACL entries */ -#define NFS_ACL_DEFAULT		0x1000 - -#ifdef __KERNEL__  #include <linux/posix_acl.h>  #include <linux/sunrpc/xdr.h> +#include <uapi/linux/nfsacl.h>  /* Maximum number of ACL entries over NFS */  #define NFS_ACL_MAX_ENTRIES	1024 @@ -51,12 +31,11 @@ nfsacl_size(struct posix_acl *acl_access, struct posix_acl *acl_default)  	return w;  } -extern unsigned int +extern int  nfsacl_encode(struct xdr_buf *buf, unsigned int base, struct inode *inode,  	      struct posix_acl *acl, int encode_entries, int typeflag); -extern unsigned int +extern int  nfsacl_decode(struct xdr_buf *buf, unsigned int base, unsigned int *aclcnt,  	      struct posix_acl **pacl); -#endif /* __KERNEL__ */  #endif  /* __LINUX_NFSACL_H */  | 
