Skip to content

Commit c99dc44

Browse files
committed
hv: convert mshv_ioctl_create_partition() to FD_ADD()
Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-39-b6efa1706cfd@kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent da7e394 commit c99dc44

1 file changed

Lines changed: 6 additions & 24 deletions

File tree

drivers/hv/mshv_root_main.c

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1870,8 +1870,6 @@ mshv_ioctl_create_partition(void __user *user_arg, struct device *module_dev)
18701870
struct hv_partition_creation_properties creation_properties = {};
18711871
union hv_partition_isolation_properties isolation_properties = {};
18721872
struct mshv_partition *partition;
1873-
struct file *file;
1874-
int fd;
18751873
long ret;
18761874

18771875
if (copy_from_user(&args, user_arg, sizeof(args)))
@@ -1938,29 +1936,13 @@ mshv_ioctl_create_partition(void __user *user_arg, struct device *module_dev)
19381936
goto delete_partition;
19391937

19401938
ret = mshv_init_async_handler(partition);
1941-
if (ret)
1942-
goto remove_partition;
1943-
1944-
fd = get_unused_fd_flags(O_CLOEXEC);
1945-
if (fd < 0) {
1946-
ret = fd;
1947-
goto remove_partition;
1948-
}
1949-
1950-
file = anon_inode_getfile("mshv_partition", &mshv_partition_fops,
1951-
partition, O_RDWR);
1952-
if (IS_ERR(file)) {
1953-
ret = PTR_ERR(file);
1954-
goto put_fd;
1939+
if (!ret) {
1940+
ret = FD_ADD(O_CLOEXEC, anon_inode_getfile("mshv_partition",
1941+
&mshv_partition_fops,
1942+
partition, O_RDWR));
1943+
if (ret >= 0)
1944+
return ret;
19551945
}
1956-
1957-
fd_install(fd, file);
1958-
1959-
return fd;
1960-
1961-
put_fd:
1962-
put_unused_fd(fd);
1963-
remove_partition:
19641946
remove_partition(partition);
19651947
delete_partition:
19661948
hv_call_delete_partition(partition->pt_id);

0 commit comments

Comments
 (0)