LU-9183 ptlrpc: handle posix_acl: xattr representation cleanups

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

diff --git a/lustre/include/lustre_eacl.h b/lustre/include/lustre_eacl.h
index 28d0c59..3061be1 100644 (file)
--- a/lustre/include/lustre_eacl.h
+++ b/lustre/include/lustre_eacl.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -28,7 +24,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -49,8 +45,8 @@
  */
 
 #ifdef CONFIG_FS_POSIX_ACL
-
-#include <linux/posix_acl_xattr.h>
+# include <linux/fs.h>
+# include <linux/posix_acl_xattr.h>
 
 typedef struct {
         __u16                   e_tag;
@@ -75,6 +71,11 @@ struct lu_ucred;
 struct lu_attr;
 struct lustre_idmap_table;
 
+#ifdef HAVE_STRUCT_POSIX_ACL_XATTR
+# define posix_acl_xattr_header struct posix_acl_xattr_header
+# define posix_acl_xattr_entry  struct posix_acl_xattr_entry
+#endif
+
 extern int lustre_posix_acl_permission(struct lu_ucred *mu,
                                        const struct lu_attr *la, int want,
                                        posix_acl_xattr_entry *entry,
@@ -85,36 +86,7 @@ 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 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
-lustre_acl_xattr_merge2posix(posix_acl_xattr_header *posix_header, int size,
-                             ext_acl_xattr_header *ext_header,
-                             posix_acl_xattr_header **out);
-extern ext_acl_xattr_header *
-lustre_acl_xattr_merge2ext(posix_acl_xattr_header *posix_header, int size,
-                           ext_acl_xattr_header *ext_header);
-
 #endif /* CONFIG_FS_POSIX_ACL */
 
 /** @} eacl */