drm/rockchip: add DRM_RENDER_ALLOW

[firefly-linux-kernel-4.4.55.git] / include / linux / nfsacl.h

diff --git a/include/linux/nfsacl.h b/include/linux/nfsacl.h
index fabcb1e5c460f240ff1f9c5e5b1d6d720505d7c5..5e69e67b31ab28bd5cb1bfc451687a36597f6b1f 100644 (file)
--- 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
@@ -58,5 +38,4 @@ extern int
 nfsacl_decode(struct xdr_buf *buf, unsigned int base, unsigned int *aclcnt,
              struct posix_acl **pacl);
 
-#endif /* __KERNEL__ */
 #endif  /* __LINUX_NFSACL_H */