diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2020-11-20 17:14:40 -0600 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2020-12-10 12:42:59 -0600 |
| commit | 9fe83c43e71cdb8e5b9520bcb98706a2b3c680c8 (patch) | |
| tree | 5037480cc99b0eb864fc0d76da4adbaeb5a061ea | |
| parent | 1572bfdf21d4d50e51941498ffe0b56c2289f783 (diff) | |
| download | lwn-9fe83c43e71cdb8e5b9520bcb98706a2b3c680c8.tar.gz lwn-9fe83c43e71cdb8e5b9520bcb98706a2b3c680c8.zip | |
file: Rename __close_fd_get_file close_fd_get_file
The function close_fd_get_file is explicitly a variant of
__close_fd[1]. Now that __close_fd has been renamed close_fd, rename
close_fd_get_file to be consistent with close_fd.
When __alloc_fd, __close_fd and __fd_install were introduced the
double underscore indicated that the function took a struct
files_struct parameter. The function __close_fd_get_file never has so
the naming has always been inconsistent. This just cleans things up
so there are not any lingering mentions or references __close_fd left
in the code.
[1] 80cd795630d6 ("binder: fix use-after-free due to ksys_close() during fdget()")
Link: https://lkml.kernel.org/r/20201120231441.29911-23-ebiederm@xmission.com
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
| -rw-r--r-- | drivers/android/binder.c | 2 | ||||
| -rw-r--r-- | fs/file.c | 4 | ||||
| -rw-r--r-- | fs/io_uring.c | 2 | ||||
| -rw-r--r-- | include/linux/fdtable.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index b5117576792b..5b2e3721ac27 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -2226,7 +2226,7 @@ static void binder_deferred_fd_close(int fd) if (!twcb) return; init_task_work(&twcb->twork, binder_do_fd_close); - __close_fd_get_file(fd, &twcb->file); + close_fd_get_file(fd, &twcb->file); if (twcb->file) { filp_close(twcb->file, current->files); task_work_add(current, &twcb->twork, TWA_RESUME); diff --git a/fs/file.c b/fs/file.c index 987ea51630b4..947ac6d5602f 100644 --- a/fs/file.c +++ b/fs/file.c @@ -721,11 +721,11 @@ int __close_range(unsigned fd, unsigned max_fd, unsigned int flags) } /* - * variant of __close_fd that gets a ref on the file for later fput. + * variant of close_fd that gets a ref on the file for later fput. * The caller must ensure that filp_close() called on the file, and then * an fput(). */ -int __close_fd_get_file(unsigned int fd, struct file **res) +int close_fd_get_file(unsigned int fd, struct file **res) { struct files_struct *files = current->files; struct file *file; diff --git a/fs/io_uring.c b/fs/io_uring.c index b42dfa0243bf..2e6e51292eff 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4206,7 +4206,7 @@ static int io_close(struct io_kiocb *req, bool force_nonblock, /* might be already done during nonblock submission */ if (!close->put_file) { - ret = __close_fd_get_file(close->fd, &close->put_file); + ret = close_fd_get_file(close->fd, &close->put_file); if (ret < 0) return (ret == -ENOENT) ? -EBADF : ret; } diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index dad4a488ce60..4ed3589f9294 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h @@ -126,7 +126,7 @@ int iterate_fd(struct files_struct *, unsigned, extern int close_fd(unsigned int fd); extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags); -extern int __close_fd_get_file(unsigned int fd, struct file **res); +extern int close_fd_get_file(unsigned int fd, struct file **res); extern int unshare_fd(unsigned long unshare_flags, unsigned int max_fds, struct files_struct **new_fdp); |