summaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/lustre/include/lustre_acl.h
diff options
context:
space:
mode:
authorJohn L. Hammond <john.hammond@intel.com>2014-08-28 18:35:10 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-30 12:17:07 -0700
commitec0859da8c325316eff942beedc4b749b5543188 (patch)
treefe697ebeef08ce5da81ce95a875f80940d579e5a /drivers/staging/lustre/lustre/include/lustre_acl.h
parenta9c7db391a7b46fd2f800671cb67c514c138ddab (diff)
downloadop-kernel-dev-ec0859da8c325316eff942beedc4b749b5543188.zip
op-kernel-dev-ec0859da8c325316eff942beedc4b749b5543188.tar.gz
staging/lustre remove linux/lustre_acl.h
Move the contents of lustre/include/linux/lustre_acl.h to lustre/include/lustre_acl.h and remove the first header. Signed-off-by: John L. Hammond <john.hammond@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/include/lustre_acl.h')
-rw-r--r--drivers/staging/lustre/lustre/include/lustre_acl.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre_acl.h b/drivers/staging/lustre/lustre/include/lustre_acl.h
index 0b6ea07..aa4cfa7 100644
--- a/drivers/staging/lustre/lustre/include/lustre_acl.h
+++ b/drivers/staging/lustre/lustre/include/lustre_acl.h
@@ -37,6 +37,13 @@
#ifndef _LUSTRE_ACL_H
#define _LUSTRE_ACL_H
-#include "linux/lustre_acl.h"
+#include <linux/fs.h>
+#include <linux/dcache.h>
+#include <linux/posix_acl_xattr.h>
+
+#define LUSTRE_POSIX_ACL_MAX_ENTRIES 32
+#define LUSTRE_POSIX_ACL_MAX_SIZE \
+ (sizeof(posix_acl_xattr_header) + \
+ LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry))
#endif
OpenPOWER on IntegriCloud