Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Preparation for CLASS(fd) conversion.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2024-07-20 00:46:31 -04:00
parent d7a9616ce0
commit 554ceb7a5e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ocfs2/cluster/heartbeat.c
View File

@ -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;
}