X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_eacl.h;h=d775fefe7e32259bd18615c323c92c6d0012ce37;hb=7d1927ec6e3298c76ff90b4c622f58d6d033ba9b;hp=f2281baa705ec8a741d2ecba1ea3d7502e886059;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_eacl.h b/lustre/include/lustre_eacl.h
index f2281ba..d775fef 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.
@@ -26,10 +24,13 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
+ * Copyright (c) 2011, 2012, Intel Corporation.
+ */
+/*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
@@ -42,14 +43,14 @@
 #ifndef _LUSTRE_EACL_H
 #define _LUSTRE_EACL_H
 
+/** \defgroup eacl eacl
+ *
+ * @{
+ */
+
 #ifdef CONFIG_FS_POSIX_ACL
 
-# ifdef HAVE_XATTR_ACL
-#  include <linux/xattr_acl.h>
-# endif /* HAVE_XATTR_ACL */
-# ifdef HAVE_LINUX_POSIX_ACL_XATTR_H
-#  include <linux/posix_acl_xattr.h>
-# endif /* HAVE_LINUX_POSIX_ACL_XATTR_H */
+#include <linux/posix_acl_xattr.h>
 
 #include <lustre_idmap.h>
 #include <md_object.h>
@@ -73,13 +74,15 @@ 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);
+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_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 ext_acl_xattr_header *
 lustre_posix_acl_xattr_2ext(posix_acl_xattr_header *header, int size);
@@ -87,16 +90,16 @@ 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);
+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 md_ucred *mu,
-                               struct lustre_idmap_table *t,
-                               ext_acl_xattr_header *header);
+lustre_ext_acl_xattr_id2server(struct lu_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
@@ -109,4 +112,6 @@ lustre_acl_xattr_merge2ext(posix_acl_xattr_header *posix_header, int size,
 
 #endif /* CONFIG_FS_POSIX_ACL */
 
+/** @} eacl */
+
 #endif