leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs: move filp_close() outside of __close_fd_get_file()

Browse Source 
Just one caller of this, and just use filp_close() there manually.
This is important to allow async close/removal of the fd.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2019-12-11 14:10:35 -07:00
parent 15b71abe7b
commit 6e802a4ba0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/android/binder.c
View File

@ -2249,10 +2249,12 @@ static void binder_deferred_fd_close(int fd)
return; return;
init_task_work(&twcb->twork, binder_do_fd_close); 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) if (twcb->file) {
filp_close(twcb->file, current->files);
task_work_add(current, &twcb->twork, true); task_work_add(current, &twcb->twork, true);
else } else {
kfree(twcb); kfree(twcb);
}
} }
static void binder_transaction_buffer_release(struct binder_proc *proc, static void binder_transaction_buffer_release(struct binder_proc *proc,

6
fs/file.c
View File

@ -642,7 +642,9 @@ out_unlock:
EXPORT_SYMBOL(__close_fd); /* for ksys_close() */ EXPORT_SYMBOL(__close_fd); /* for ksys_close() */
/* /*
* 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)
{ {
@ -662,7 +664,7 @@ int __close_fd_get_file(unsigned int fd, struct file **res)
spin_unlock(&files->file_lock); spin_unlock(&files->file_lock);
get_file(file); get_file(file);
*res = file; *res = file;
return filp_close(file, files); return 0;
out_unlock: out_unlock:
spin_unlock(&files->file_lock); spin_unlock(&files->file_lock);