LU-2675 lustre: remove linux/lustre_acl.h

Remove lustre/include/linux/lustre_acl.h. Include linux/xattr.h where
needed.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I1faec3acb8ff0b578a2f962a4601a44f17d65c41
Reviewed-on: http://review.whamcloud.com/11490
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: frank zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am
index 401eef4..9aa59f9 100644 (file)
--- a/lustre/include/linux/Makefile.am
+++ b/lustre/include/linux/Makefile.am
@@ -42,7 +42,7 @@ if UTILS
 linux_HEADERS = lustre_user.h
 endif
 
-EXTRA_DIST = lustre_acl.h lustre_debug.h lustre_lib.h \
+EXTRA_DIST = lustre_debug.h lustre_lib.h \
        lustre_dlm.h  lustre_handles.h lustre_net.h obd_class.h obd_support.h \
        obd.h lvfs.h lustre_log.h lustre_compat25.h lustre_lite.h lustre_quota.h \
        lustre_user.h lustre_patchless_compat.h lustre_intent.h lustre_common.h

diff --git a/lustre/include/linux/lustre_acl.h b/lustre/include/linux/lustre_acl.h
deleted file mode 100644 (file)
index e7df7f1..0000000
--- a/lustre/include/linux/lustre_acl.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * 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.
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2005, 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.
- *
- * lustre/lustre/include/lustre_acl.h
- *
- * MDS data structures.
- * See also lustre_idl.h for wire formats of requests.
- */
-
-#ifndef _LUSTRE_LINUX_ACL_H
-#define _LUSTRE_LINUX_ACL_H
-
-#ifndef        _LUSTRE_ACL_H
-#error Shoud not include direectly. use #include <lustre_acl.h> instead
-#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 */
-# include <linux/lustre_intent.h>
-# include <linux/xattr.h> /* XATTR_{REPLACE,CREATE} */
-#endif /* __KERNEL__ */
-
-#ifndef LUSTRE_POSIX_ACL_MAX_SIZE
-# define LUSTRE_POSIX_ACL_MAX_SIZE   0
-#endif
-
-#endif /* _LUSTRE_LINUX_ACL_H */

diff --git a/lustre/include/lustre_acl.h b/lustre/include/lustre_acl.h
index 5cfb87b..ac44008 100644 (file)
--- a/lustre/include/lustre_acl.h
+++ b/lustre/include/lustre_acl.h
@@ -37,6 +37,20 @@
 #ifndef _LUSTRE_ACL_H
 #define _LUSTRE_ACL_H
 
-#include <linux/lustre_acl.h>
+#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

diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c
index c8ced24..818c52d 100644 (file)
--- a/lustre/mdt/mdt_xattr.c
+++ b/lustre/mdt/mdt_xattr.c
@@ -45,6 +45,7 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
+#include <linux/xattr.h>
 #include <lustre_acl.h>
 #include "mdt_internal.h"