Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f0d01ea authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

ext4: unindent codeblock in ext4_xattr_block_set() 



[ Upstream commit fd48e9acdf26d0cbd80051de07d4a735d05d29b2 ]

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>
Link: https://lore.kernel.org/r/20220712105436.32204-4-jack@suse.cz


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Stable-dep-of: a44e84a9b776 ("ext4: fix deadlock due to mbcache entry corruption")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bb337d8d

fs/ext4/xattr.c

+38 −39
Original line number Diff line number Diff line
@@ -1867,6 +1867,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)
@@ -1898,9 +1900,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 = kmemdup(BHDR(bs->bh), bs->bh->b_size, GFP_NOFS);
@@ -1941,7 +1941,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);