[PATCH] ext4: remove unnecessary gotos in ext4_xattr_set_entry

From: Pavel Tikhomirov
Date: Fri May 31 2019 - 08:14:07 EST


In the "out" label we only iput old/new_ea_inode-s, in all these places
these variables are always NULL so there is no point in goto to "out".

Signed-off-by: Pavel Tikhomirov <ptikhomirov@xxxxxxxxxxxxx>
---
fs/ext4/xattr.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 491f9ee4040e..ac2ddd4446b3 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1601,8 +1601,7 @@ static int ext4_xattr_set_entry(struct ext4_xattr_info *i,
next = EXT4_XATTR_NEXT(last);
if ((void *)next >= s->end) {
EXT4_ERROR_INODE(inode, "corrupted xattr entries");
- ret = -EFSCORRUPTED;
- goto out;
+ return -EFSCORRUPTED;
}
if (!last->e_value_inum && last->e_value_size) {
size_t offs = le16_to_cpu(last->e_value_offs);
@@ -1620,8 +1619,7 @@ static int ext4_xattr_set_entry(struct ext4_xattr_info *i,
free += EXT4_XATTR_LEN(name_len) + old_size;

if (free < EXT4_XATTR_LEN(name_len) + new_size) {
- ret = -ENOSPC;
- goto out;
+ return -ENOSPC;
}

/*
@@ -1634,8 +1632,7 @@ static int ext4_xattr_set_entry(struct ext4_xattr_info *i,
new_size && is_block &&
(min_offs + old_size - new_size) <
EXT4_XATTR_BLOCK_RESERVE(inode)) {
- ret = -ENOSPC;
- goto out;
+ return -ENOSPC;
}
}

--
2.20.1