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>

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index b2dad43dbf82962b76c47c0a87d44bd15541e1de..cf72ca250a08c5cd6b798bbf28ce807f56757208 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2249,10 +2249,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, true);
-       else
+       } else {
                kfree(twcb);
+       }
 }
 
 static void binder_transaction_buffer_release(struct binder_proc *proc,

diff --git a/fs/file.c b/fs/file.c
index 3da91a112babe874af392635a32e971d8885937f..fb7081bfac2bca6b5dc24aef8e4cc0fdafc03739 100644 (file)
--- a/fs/file.c
+++ b/fs/file.c
@@ -642,7 +642,9 @@ out_unlock:
 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)
 {
@@ -662,7 +664,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);