Commit 7a85eabf authored Apr 16, 2018 by James Simmons Committed by Greg Kroah-Hartman Apr 23, 2018

staging: lustre: llite: cleanup posix acl xattr code



Having an extra ifdef makes the code harder to read. For the case
of ll_xattr_get_common() we have a variable initialized at the
start of the function but it is only used in XATTR_ACL_ACCESS_T
code block. Lets move that variable to that location since its
only used there and make the code look cleaner.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-9183
Reviewed-on: https://review.whamcloud.com/27240


Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6da269bd

drivers/staging/lustre/lustre/llite/xattr.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -396,9 +396,6 @@ static int ll_xattr_get_common(const struct xattr_handler *handler,
		const char name, void buffer, size_t size)
		{
		struct ll_sb_info *sbi = ll_i2sbi(inode);
		#ifdef CONFIG_FS_POSIX_ACL
		struct ll_inode_info *lli = ll_i2info(inode);
		#endif
		char *fullname;
		int rc;

		@@ -422,6 +419,7 @@ static int ll_xattr_get_common(const struct xattr_handler *handler,
		* chance that cached ACL is uptodate.
		*/
		if (handler->flags == XATTR_ACL_ACCESS_T) {
		struct ll_inode_info *lli = ll_i2info(inode);
		struct posix_acl *acl;

		spin_lock(&lli->lli_lock);