X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_acl.h;h=f7635122841e1638b00b7e1e81f59af41db567c9;hp=cfdc247f280ff9b586b8e903bc1cfb3c94780336;hb=16e0fe6eab3e54aa7beddb75bf7dae05645408e9;hpb=cefa8cda2ba2d288ccaa4ec077a6c627592503ea

diff --git a/lustre/include/linux/lustre_acl.h b/lustre/include/linux/lustre_acl.h
index cfdc247..f763512 100644
--- a/lustre/include/linux/lustre_acl.h
+++ b/lustre/include/linux/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.
@@ -26,14 +24,17 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
+ * Copyright (c) 2011, Intel Corporation.
+ */
+/*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
- * lustre/lustre/include/lustre_idmap.h
+ * lustre/lustre/include/lustre_acl.h
  *
  * MDS data structures.
  * See also lustre_idl.h for wire formats of requests.
@@ -50,40 +51,15 @@
 # include <linux/fs.h>
 # include <linux/dcache.h>
 # 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>
+#  define LUSTRE_POSIX_ACL_MAX_SIZE   XATTR_ACL_SIZE
 # endif /* CONFIG_FS_POSIX_ACL */
-# ifndef HAVE_VFS_INTENT_PATCHES
-#  include <linux/lustre_intent.h>
-# endif
+# include <linux/lustre_intent.h>
+# include <linux/xattr.h> /* XATTR_{REPLACE,CREATE} */
 #endif /* __KERNEL__ */
 
-/* ACL */
-#ifdef CONFIG_FS_POSIX_ACL
-# ifdef HAVE_XATTR_ACL
-#  define MDS_XATTR_NAME_ACL_ACCESS XATTR_NAME_ACL_ACCESS
-#  define mds_xattr_acl_size(entry) xattr_acl_size(entry)
-# else /* HAVE_XATTR_ACL */
-#  ifdef HAVE_LINUX_POSIX_ACL_XATTR_H
-#   define MDS_XATTR_NAME_ACL_ACCESS POSIX_ACL_XATTR_ACCESS
-#   define mds_xattr_acl_size(entry) posix_acl_xattr_size(entry)
-#  endif /* HAVE_LINUX_POSIX_ACL_XATTR_H */
-# endif /* HAVE_XATTR_ACL */
-
-# define LUSTRE_POSIX_ACL_MAX_ENTRIES   (32)
-
-#ifdef __KERNEL__
-# define LUSTRE_POSIX_ACL_MAX_SIZE   XATTR_ACL_SIZE
-#else
+#ifndef LUSTRE_POSIX_ACL_MAX_SIZE
 # define LUSTRE_POSIX_ACL_MAX_SIZE   0
 #endif
 
-# else /* CONFIG_FS_POSIX_ACL */
-# define LUSTRE_POSIX_ACL_MAX_SIZE      0
-# endif /* CONFIG_FS_POSIX_ACL */
-
 #endif /* _LUSTRE_LINUX_ACL_H */