Skip to content
Permalink
Browse files Browse the repository at this point in the history
fs: move filp_close() outside of __close_fd_get_file()
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>
(cherry picked from commit 6e802a4)
Conflicts:
    drivers/android/binder.c: no real conflict but code base difference
Orabug: 33413846
Signed-off-by: Prasad Singamsetty <prasad.singamsetty@oracle.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
  • Loading branch information
axboe authored and SherryYang1 committed May 4, 2022
1 parent 033736b commit 49c68f5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions drivers/android/binder.c
Expand Up @@ -2236,10 +2236,12 @@ static void binder_deferred_fd_close(int fd)
return;
init_task_work(&twcb->twork, binder_do_fd_close);
__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, TWA_RESUME);
else
} else {
kfree(twcb);
}
}

static void binder_transaction_buffer_release(struct binder_proc *proc,
Expand Down
6 changes: 4 additions & 2 deletions fs/file.c
Expand Up @@ -650,7 +650,9 @@ int __close_fd(struct files_struct *files, unsigned fd)
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)
{
Expand All @@ -670,7 +672,7 @@ int __close_fd_get_file(unsigned int fd, struct file **res)
spin_unlock(&files->file_lock);
get_file(file);
*res = file;
return filp_close(file, files);
return 0;

out_unlock:
spin_unlock(&files->file_lock);
Expand Down

0 comments on commit 49c68f5

Please sign in to comment.