LU-1330 obdclass: splits server-side object stack from client

[fs/lustre-release.git] / lustre / include / lustre_eacl.h

diff --git a/lustre/include/lustre_eacl.h b/lustre/include/lustre_eacl.h
index d775fef..917e52c 100644 (file)
--- a/lustre/include/lustre_eacl.h
+++ b/lustre/include/lustre_eacl.h
@@ -52,10 +52,6 @@
 
 #include <linux/posix_acl_xattr.h>
 
 
 #include <linux/posix_acl_xattr.h>
 

-#include <lustre_idmap.h>
-#include <md_object.h>
-#include <lu_object.h>
-

 typedef struct {
         __u16                   e_tag;
         __u16                   e_perm;
 typedef struct {
         __u16                   e_tag;
         __u16                   e_perm;


@@ -74,6 +70,11 @@ typedef struct {
 #define CFS_ACL_XATTR_COUNT(size, prefix) \
         (((size) - sizeof(prefix ## _header)) / sizeof(prefix ## _entry))
 
 #define CFS_ACL_XATTR_COUNT(size, prefix) \
         (((size) - sizeof(prefix ## _header)) / sizeof(prefix ## _entry))
 

+#ifdef HAVE_SERVER_SUPPORT
+struct lu_ucred;
+struct lu_attr;
+struct lustre_idmap_table;
+

 extern int lustre_posix_acl_permission(struct lu_ucred *mu, struct lu_attr *la,
                                       int want, posix_acl_xattr_entry *entry,
                                       int count);
 extern int lustre_posix_acl_permission(struct lu_ucred *mu, struct lu_attr *la,
                                       int want, posix_acl_xattr_entry *entry,
                                       int count);


@@ -84,22 +85,25 @@ extern int lustre_posix_acl_create_masq(posix_acl_xattr_entry *entry,
 extern int lustre_posix_acl_equiv_mode(posix_acl_xattr_entry *entry, mode_t *mode_p,
                                       int count);
 
 extern int lustre_posix_acl_equiv_mode(posix_acl_xattr_entry *entry, mode_t *mode_p,
                                       int count);
 

-extern ext_acl_xattr_header *
-lustre_posix_acl_xattr_2ext(posix_acl_xattr_header *header, int size);
-extern int
-lustre_posix_acl_xattr_filter(posix_acl_xattr_header *header, int size,
-                              posix_acl_xattr_header **out);

 extern int
 lustre_posix_acl_xattr_id2client(struct lu_ucred *mu,
                                 struct lustre_idmap_table *t,
                                 posix_acl_xattr_header *header,
                                 int size, int flags);
 extern int
 lustre_posix_acl_xattr_id2client(struct lu_ucred *mu,
                                 struct lustre_idmap_table *t,
                                 posix_acl_xattr_header *header,
                                 int size, int flags);

-extern void
-lustre_posix_acl_xattr_free(posix_acl_xattr_header *header, int size);
+

 extern int
 lustre_ext_acl_xattr_id2server(struct lu_ucred *mu,
                               struct lustre_idmap_table *t,
                               ext_acl_xattr_header *header);
 extern int
 lustre_ext_acl_xattr_id2server(struct lu_ucred *mu,
                               struct lustre_idmap_table *t,
                               ext_acl_xattr_header *header);

+#endif /* HAVE_SERVER_SUPPORT */
+
+extern ext_acl_xattr_header *
+lustre_posix_acl_xattr_2ext(posix_acl_xattr_header *header, int size);
+extern int
+lustre_posix_acl_xattr_filter(posix_acl_xattr_header *header, int size,
+                             posix_acl_xattr_header **out);
+extern void
+lustre_posix_acl_xattr_free(posix_acl_xattr_header *header, int size);

 extern void
 lustre_ext_acl_xattr_free(ext_acl_xattr_header *header);
 extern int
 extern void
 lustre_ext_acl_xattr_free(ext_acl_xattr_header *header);
 extern int