Unverified Commit a88c955f authored by Christian Brauner's avatar Christian Brauner
Browse files

file: s/close_fd_get_file()/file_close_fd()/g 

That really shouldn't have "get" in there as that implies we're bumping
the reference count which we don't do at all. We used to but not anmore.
Now we're just closing the fd and pick that file from the fdtable
without bumping the reference count. Update the wrong documentation
while at it.

Link: https://lore.kernel.org/r/20231130-vfs-files-fixes-v1-1-e73ca6f4ea83@kernel.org


Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 253ca867

drivers/android/binder.c

+1 −1
Original line number Diff line number Diff line
@@ -1921,7 +1921,7 @@ static void binder_deferred_fd_close(int fd) 
	if (!twcb)

		return;

	init_task_work(&twcb->twork, binder_do_fd_close);

	twcb->file = close_fd_get_file(fd);

	twcb->file = file_close_fd(fd);

	if (twcb->file) {

		// pin it until binder_do_fd_close(); see comments there

		get_file(twcb->file);

fs/file.c

+9 −5
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ int __close_range(unsigned fd, unsigned max_fd, unsigned int flags) 
}



/*

 * See close_fd_get_file() below, this variant assumes current->files->file_lock

 * See file_close_fd() below, this variant assumes current->files->file_lock

 * is held.

 */

struct file *__close_fd_get_file(unsigned int fd)
@@ -804,11 +804,15 @@ struct file *__close_fd_get_file(unsigned int fd) 
	return pick_file(current->files, fd);

}



/*

 * 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.

/**

 * file_close_fd - return file associated with fd

 * @fd: file descriptor to retrieve file for

 *

 * Doesn't take a separate reference count.

 *

 * Returns: The file associated with @fd (NULL if @fd is not open)

 */

struct file *close_fd_get_file(unsigned int fd)

struct file *file_close_fd(unsigned int fd)

{

	struct files_struct *files = current->files;

	struct file *file;

fs/open.c

+1 −1
Original line number Diff line number Diff line
@@ -1577,7 +1577,7 @@ SYSCALL_DEFINE1(close, unsigned int, fd) 
	int retval;

	struct file *file;



	file = close_fd_get_file(fd);

	file = file_close_fd(fd);

	if (!file)

		return -EBADF;

include/linux/fdtable.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ int iterate_fd(struct files_struct *, unsigned, 


extern int close_fd(unsigned int fd);

extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags);

extern struct file *close_fd_get_file(unsigned int fd);

extern struct file *file_close_fd(unsigned int fd);

extern int unshare_fd(unsigned long unshare_flags, unsigned int max_fds,

		      struct files_struct **new_fdp);