X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_acl.h;h=64c86f8295db95aa5483d7122564729c043be03d;hb=34dada1c3e59b2ed3debd4c46347c1352dd958d0;hp=1ff431a8029d859f5141c8f10c3c8c7592757c6e;hpb=0f8dca08a4f68cba82c2c822998ecc309d3b7aaf;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_acl.h b/lustre/include/lustre_acl.h
index 1ff431a..64c86f8 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.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,13 +39,20 @@
 #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
+#ifdef __KERNEL__
+# include <linux/fs.h>
+# include <linux/dcache.h>
+# ifdef CONFIG_FS_POSIX_ACL
+#  include <linux/posix_acl_xattr.h>
+#  define LUSTRE_POSIX_ACL_MAX_ENTRIES 32
+#  define LUSTRE_POSIX_ACL_MAX_SIZE					\
+	(sizeof(posix_acl_xattr_header) +				\
+	 LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry))
+# endif /* CONFIG_FS_POSIX_ACL */
+#endif /* __KERNEL__ */
+
+#ifndef LUSTRE_POSIX_ACL_MAX_SIZE
+# define LUSTRE_POSIX_ACL_MAX_SIZE 0
+#endif /* LUSTRE_POSIX_ACL_MAX_SIZE */
 
 #endif