Commit afddb4f7 authored by Jan Kara's avatar Jan Kara Committed by Zheng Zengkai
Browse files

ext4: Unindent codeblock in ext4_xattr_block_set() 

hulk inclusion
category: bugfix
bugzilla: 186975, https://gitee.com/openeuler/kernel/issues/I5HT6F
CVE: NA

Reference: https://patchwork.ozlabs.org/project/linux-ext4/list/?series=309169



--------------------------------

Remove unnecessary else (and thus indentation level) from a code block
in ext4_xattr_block_set(). It will also make following code changes
easier. No functional changes.

CC: stable@vger.kernel.org
Fixes: 82939d79 ("ext4: convert to mbcache2")
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Conflicts:
	fs/ext4/xattr.c
	[ 188c299e ("ext4: Support for checksumming from
          journal triggers") is not applied. ]
Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent bd9cf9ac

fs/ext4/xattr.c

+39 −40
Original line number Diff line number Diff line
@@ -1846,6 +1846,8 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, 
#define header(x) ((struct ext4_xattr_header *)(x))



	if (s->base) {

		int offset = (char *)s->here - bs->bh->b_data;



		BUFFER_TRACE(bs->bh, "get_write_access");

		error = ext4_journal_get_write_access(handle, bs->bh);

		if (error)
@@ -1877,9 +1879,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, 
			if (error)

				goto cleanup;

			goto inserted;

		} else {

			int offset = (char *)s->here - bs->bh->b_data;



		}

		unlock_buffer(bs->bh);

		ea_bdebug(bs->bh, "cloning");

		s->base = kmalloc(bs->bh->b_size, GFP_NOFS);
@@ -1921,7 +1921,6 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, 
			s->here->e_value_inum = 0;

			s->here->e_value_size = 0;

		}

		}

	} else {

		/* Allocate a buffer where we construct the new block. */

		s->base = kzalloc(sb->s_blocksize, GFP_NOFS);