diff --git a/drivers/android/binder.c b/drivers/android/binder.c index cfb1393a0891a44d3481bcb280e6c367755f1ba0..a867fd47ac4659ec406adb0df146997b755a31d2 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -2242,7 +2242,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 cf236025e7984ee53175cea67e041353b8c7018d..045a29e55c3d4ecadfd812254153155896f0dc5a 100644 --- a/fs/file.c +++ b/fs/file.c @@ -829,11 +829,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 add03c27aa13f5b2750356ed917917116f186a15..cfcdea67a0e37f70d0500d7a7b819e59f6654624 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4270,7 +4270,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 b4ee25d4efe5271b1e1879cc8af5fa9243555ff8..e2df70d7bcc3fb6c9d13d5cf1175980bf137a57e 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h @@ -124,7 +124,7 @@ extern void __fd_install(struct files_struct *files, extern int __close_fd(struct files_struct *files, 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);