X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_eacl.h;h=a8c1dfe76ba64d7e5fabbf7abf2d6d2593a92383;hb=ad21703f66c0d013d3cbd2d7f307715ef77864ff;hp=9dfbfd1ab05459ee4a3ad24960c5fe613e770bc6;hpb=ac1b1940adc038b94fab1e201f8f7d362c711bf2;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_eacl.h b/lustre/include/lustre_eacl.h
index 9dfbfd1..a8c1dfe 100644
--- a/lustre/include/lustre_eacl.h
+++ b/lustre/include/lustre_eacl.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -51,12 +49,8 @@
  */
 
 #ifdef CONFIG_FS_POSIX_ACL
-
-#include <linux/posix_acl_xattr.h>
-
-#include <lustre_idmap.h>
-#include <md_object.h>
-#include <lu_object.h>
+# include <linux/fs.h>
+# include <linux/posix_acl_xattr.h>
 
 typedef struct {
         __u16                   e_tag;
@@ -76,30 +70,41 @@ typedef struct {
 #define CFS_ACL_XATTR_COUNT(size, prefix) \
         (((size) - sizeof(prefix ## _header)) / sizeof(prefix ## _entry))
 
-extern int lustre_posix_acl_permission(struct md_ucred *mu, struct lu_attr *la,
-                                       int want, posix_acl_xattr_entry *entry,
-                                       int count);
+#ifdef HAVE_SERVER_SUPPORT
+struct lu_ucred;
+struct lu_attr;
+struct lustre_idmap_table;
+
+extern int lustre_posix_acl_permission(struct lu_ucred *mu,
+					const struct lu_attr *la, int want,
+					posix_acl_xattr_entry *entry,
+					int count);
 extern int lustre_posix_acl_chmod_masq(posix_acl_xattr_entry *entry,
                                        __u32 mode, int count);
 extern int lustre_posix_acl_create_masq(posix_acl_xattr_entry *entry,
                                         __u32 *pmode, int count);
+extern int lustre_posix_acl_equiv_mode(posix_acl_xattr_entry *entry, mode_t *mode_p,
+				       int count);
+
+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_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 int
-lustre_posix_acl_xattr_id2client(struct md_ucred *mu,
-                                 struct lustre_idmap_table *t,
-                                 posix_acl_xattr_header *header,
-                                 int size, int flags);
+			      posix_acl_xattr_header **out);
 extern void
 lustre_posix_acl_xattr_free(posix_acl_xattr_header *header, int size);
-extern int
-lustre_ext_acl_xattr_id2server(struct md_ucred *mu,
-                               struct lustre_idmap_table *t,
-                               ext_acl_xattr_header *header);
 extern void
 lustre_ext_acl_xattr_free(ext_acl_xattr_header *header);
 extern int