Commit 6e802a4b authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarJens Axboe <axboe@kernel.dk>
parent 15b71abe

drivers/android/binder.c

+4 −2
Original line number Diff line number Diff line
@@ -2249,11 +2249,13 @@ 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,

					      struct binder_buffer *buffer,

fs/file.c

+4 −2
Original line number Diff line number Diff line
@@ -642,7 +642,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)

{
@@ -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);