staging/lustre: fix build error in ll_setxattr_common
authorPeng Tao <bergwolf@gmail.com>
Tue, 3 Dec 2013 17:54:56 +0000 (01:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Dec 2013 23:27:11 +0000 (15:27 -0800)
With CONFIG_FS_POSIX_ACL off, we'll get
drivers/staging/lustre/lustre/llite/xattr.c: In function ‘ll_setxattr_common’:
drivers/staging/lustre/lustre/llite/xattr.c:187:7: error: ‘rce’ undeclared (first use in this function)
drivers/staging/lustre/lustre/llite/xattr.c:187:7: note: each undeclared identifier is reported only once for each function it appears in

It was introduced by 7fc1f83 (staging/lustre/llite: extended attribute cache)
that added new reference but didn't take care of CONFIG_FS_POSIX_ACL.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/llite/xattr.c

index ee95855a2cf32abfb6c89a0e0739a0a07fd9cb1d..3a7d03c12dd92ab4626e62ea73ffcb266814fbf7 100644 (file)
@@ -112,9 +112,9 @@ int ll_setxattr_common(struct inode *inode, const char *name,
        struct ptlrpc_request *req = NULL;
        int xattr_type, rc;
        struct obd_capa *oc;
+       struct rmtacl_ctl_entry *rce = NULL;
 #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;