staging/lustre/llite: fix build erorr if CONFIG_FS_POSIX_ACL is off

Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index 5227c5c4ebe21845905104d1f99bdc2ced46f6d1..1069b8dd84dcbd58f1939cd73df98361013be194 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -438,14 +438,6 @@ struct rmtacl_ctl_table {
 
 #define EE_HASHES       32
 
-struct eacl_entry {
-       struct list_head            ee_list;
-       pid_t            ee_key; /* hash key */
-       struct lu_fid    ee_fid;
-       int                ee_type; /* ACL type for ACCESS or DEFAULT */
-       ext_acl_xattr_header *ee_acl;
-};
-
 struct eacl_table {
        spinlock_t      et_lock;
        struct list_head        et_entries[EE_HASHES];
@@ -1168,6 +1160,14 @@ void ll_ra_stats_inc(struct address_space *mapping, enum ra_stat which);
 
 /* llite/llite_rmtacl.c */
 #ifdef CONFIG_FS_POSIX_ACL
+struct eacl_entry {
+       struct list_head            ee_list;
+       pid_t            ee_key; /* hash key */
+       struct lu_fid    ee_fid;
+       int                ee_type; /* ACL type for ACCESS or DEFAULT */
+       ext_acl_xattr_header *ee_acl;
+};
+
 obd_valid rce_ops2valid(int ops);
 struct rmtacl_ctl_entry *rct_search(struct rmtacl_ctl_table *rct, pid_t key);
 int rct_add(struct rmtacl_ctl_table *rct, pid_t key, int ops);
@@ -1183,6 +1183,11 @@ struct eacl_entry *et_search_del(struct eacl_table *et, pid_t key,
 void et_search_free(struct eacl_table *et, pid_t key);
 void et_init(struct eacl_table *et);
 void et_fini(struct eacl_table *et);
+#else
+static inline obd_valid rce_ops2valid(int ops)
+{
+       return 0;
+}
 #endif
 
 /* statahead.c */

diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index 4176264984bb6f79ffe29340b5e93184d4a82742..0a11902c4d2b36c6575259085dfef3a9176592e7 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -112,9 +112,11 @@ int ll_setxattr_common(struct inode *inode, const char *name,
        struct ptlrpc_request *req;
        int xattr_type, rc;
        struct obd_capa *oc;
+#ifdef CONFIG_FS_POSIX_ACL
        posix_acl_xattr_header *new_value = NULL;
        struct rmtacl_ctl_entry *rce = NULL;
        ext_acl_xattr_header *acl = NULL;
+#endif
        const char *pv = value;
        ENTRY;