X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_acl.h;h=487fb8ed9ec9c02dd43db5e9a4b5151c13065fc5;hb=b09afdf57643cbc1c437a42b4babb0837dd19e65;hp=5fe2a1af6f45852d1be2d27613f7ec61b0af4f26;hpb=f3b34344934b126157955984c7943f1200a7bca9;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_acl.h b/lustre/include/lustre_acl.h
index 5fe2a1a..487fb8e 100644
--- a/lustre/include/lustre_acl.h
+++ b/lustre/include/lustre_acl.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.
@@ -17,17 +15,15 @@
  *
  * 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
  */
 /*
- * 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) 2014, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,13 +35,18 @@
 #ifndef _LUSTRE_ACL_H
 #define _LUSTRE_ACL_H
 
-#if defined(__linux__)
-#include <linux/lustre_acl.h>
-#elif defined(__APPLE__)
-#include <darwin/lustre_acl.h>
-#elif defined(__WINNT__)
-#include <winnt/lustre_acl.h>
-#error Unsupported operating system.
-#endif
+#include <linux/fs.h>
+#include <linux/dcache.h>
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
+# include <linux/posix_acl_xattr.h>
+# define LUSTRE_POSIX_ACL_MAX_ENTRIES 32
+# define LUSTRE_POSIX_ACL_MAX_SIZE_OLD					\
+	(sizeof(posix_acl_xattr_header) +				\
+	 LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry))
+#endif /* CONFIG_LUSTRE_FS_POSIX_ACL */
+
+#ifndef LUSTRE_POSIX_ACL_MAX_SIZE_OLD
+# define LUSTRE_POSIX_ACL_MAX_SIZE_OLD 0
+#endif /* LUSTRE_POSIX_ACL_MAX_SIZE */
 
 #endif