LU-787 clio: ftruncate shouldn't block when grouplock is hold

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

diff --git a/lustre/include/lustre_eacl.h b/lustre/include/lustre_eacl.h
index 80906f4..9dfbfd1 100644 (file)
--- a/lustre/include/lustre_eacl.h
+++ b/lustre/include/lustre_eacl.h
@@ -26,10 +26,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) 2012 Whamcloud, Inc.
+ */
+/*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
@@ -49,12 +52,7 @@
 
 #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>