From: Peng Tao Date: Tue, 3 Dec 2013 17:54:56 +0000 (+0800) Subject: staging/lustre: fix build error in ll_setxattr_common X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=284c145e7e06858ce93a7164fc8420434f4f72cb;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git staging/lustre: fix build error in ll_setxattr_common 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 Cc: Andreas Dilger Signed-off-by: Peng Tao Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c index ee95855a2cf3..3a7d03c12dd9 100644 --- a/drivers/staging/lustre/lustre/llite/xattr.c +++ b/drivers/staging/lustre/lustre/llite/xattr.c @@ -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;