From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 20 Jul 2024 04:46:31 +0000 (-0400)
Subject: o2hb_region_dev_store(): avoid goto around fdget()/fdput()
X-Git-Tag: v6.13-rc1~218^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=554ceb7a5e14435725ac59a42bf0708f95721405;p=thirdparty%2Fkernel%2Flinux.git

o2hb_region_dev_store(): avoid goto around fdget()/fdput()

Preparation for CLASS(fd) conversion.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 4b9f45d7049e3..bc55340a60c3d 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1770,23 +1770,23 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,
 	int live_threshold;
 
 	if (reg->hr_bdev_file)
-		goto out;
+		return -EINVAL;
 
 	/* We can't heartbeat without having had our node number
 	 * configured yet. */
 	if (o2nm_this_node() == O2NM_MAX_NODES)
-		goto out;
+		return -EINVAL;
 
 	fd = simple_strtol(p, &p, 0);
 	if (!p || (*p && (*p != '\n')))
-		goto out;
+		return -EINVAL;
 
 	if (fd < 0 || fd >= INT_MAX)
-		goto out;
+		return -EINVAL;
 
 	f = fdget(fd);
 	if (fd_file(f) == NULL)
-		goto out;
+		return -EINVAL;
 
 	if (reg->hr_blocks == 0 || reg->hr_start_block == 0 ||
 	    reg->hr_block_bytes == 0)
@@ -1908,7 +1908,6 @@ out3:
 	}
 out2:
 	fdput(f);
-out:
 	return ret;
 }