diff options
author | Christian Brauner <brauner@kernel.org> | 2023-12-21 13:21:52 +0100 |
---|---|---|
committer | Christian Brauner <brauner@kernel.org> | 2023-12-21 13:21:52 +0100 |
commit | 2137e1564267001b25143d21bc619189c1f74bc6 (patch) | |
tree | e5d680049a77852f4cde8aa396c0faa72de4c854 /drivers/vdpa | |
parent | 1bfc466b13cf6652ba227c282c27a30ffede69a5 (diff) | |
parent | 4e94ddfe2aab72139acb8d5372fac9e6c3f3e383 (diff) |
Merge branch 'vfs.file'
Bring in the changes to the file infrastructure for this cycle. Mostly
cleanups and some performance tweaks.
* file: remove __receive_fd()
* file: stop exposing receive_fd_user()
* fs: replace f_rcuhead with f_task_work
* file: remove pointless wrapper
* file: s/close_fd_get_file()/file_close_fd()/g
* Improve __fget_files_rcu() code generation (and thus __fget_light())
* file: massage cleanup of files that failed to open
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'drivers/vdpa')
-rw-r--r-- | drivers/vdpa/vdpa_user/vduse_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 6cb5ce4a8b9a..1d24da79c399 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -1157,7 +1157,7 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd, fput(f); break; } - ret = receive_fd(f, perm_to_file_flags(entry.perm)); + ret = receive_fd(f, NULL, perm_to_file_flags(entry.perm)); fput(f); break; } |