diff mbox series

[v3,08/28] simplify xfs_find_handle() a bit

Message ID	20241102050827.2451599-8-viro@zeniv.linux.org.uk (mailing list archive)
State	New
Headers	show Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [62.89.141.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C51FB14831E; Sat, 2 Nov 2024 05:08:29 +0000 (UTC) From: Al Viro <viro@zeniv.linux.org.uk> To: linux-fsdevel@vger.kernel.org Cc: viro@zeniv.linux.org.uk, brauner@kernel.org, cgroups@vger.kernel.org, kvm@vger.kernel.org, netdev@vger.kernel.org, torvalds@linux-foundation.org Subject: [PATCH v3 08/28] simplify xfs_find_handle() a bit Date: Sat, 2 Nov 2024 05:08:06 +0000 Message-ID: <20241102050827.2451599-8-viro@zeniv.linux.org.uk> In-Reply-To: <20241102050827.2451599-1-viro@zeniv.linux.org.uk> References: <20241102050219.GA2450028@ZenIV> <20241102050827.2451599-1-viro@zeniv.linux.org.uk> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Al Viro <viro@ftp.linux.org.uk>
Series	[v3,01/28] net/socket.c: switch to CLASS(fd) \| expand [v3,01/28] net/socket.c: switch to CLASS(fd) [v3,02/28] regularize emptiness checks in fini_module(2) and vfs_dedupe_file_range() [v3,03/28] timerfd: switch to CLASS(fd) [v3,04/28] get rid of perf_fget_light(), convert kernel/events/core.c to CLASS(fd) [v3,05/28] switch netlink_getsockbyfilp() to taking descriptor [v3,06/28] do_mq_notify(): saner skb freeing on failures [v3,07/28] do_mq_notify(): switch to CLASS(fd) [v3,08/28] simplify xfs_find_handle() a bit [v3,09/28] convert vmsplice() to CLASS(fd) [v3,10/28] fdget_raw() users: switch to CLASS(fd_raw) [v3,11/28] introduce "fd_pos" class, convert fdget_pos() users to it. [v3,12/28] o2hb_region_dev_store(): avoid goto around fdget()/fdput() [v3,13/28] privcmd_ioeventfd_assign(): don't open-code eventfd_ctx_fdget() [v3,14/28] fdget(), trivial conversions [v3,15/28] fdget(), more trivial conversions [v3,16/28] convert do_preadv()/do_pwritev() [v3,17/28] convert cachestat(2) [v3,18/28] switch spufs_calls_{get,put}() to CLASS() use [v3,19/28] convert spu_run(2) [v3,20/28] convert media_request_get_by_fd() [v3,21/28] convert cifs_ioctl_copychunk() [v3,22/28] convert vfs_dedupe_file_range(). [v3,23/28] convert do_select() [v3,24/28] do_pollfd(): convert to CLASS(fd) [v3,25/28] assorted variants of irqfd setup: convert to CLASS(fd) [v3,26/28] memcg_write_event_control(): switch to CLASS(fd) [v3,27/28] css_set_fork(): switch to CLASS(fd_raw, ...) [v3,28/28] deal with the last remaing boolean uses of fd_file()

Commit Message

Al Viro Nov. 2, 2024, 5:08 a.m. UTC

XFS_IOC_FD_TO_HANDLE can grab a reference to copied ->f_path and
let the file go; results in simpler control flow - cleanup is
the same for both "by descriptor" and "by pathname" cases.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/xfs/xfs_handle.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/fs/xfs/xfs_handle.c b/fs/xfs/xfs_handle.c
index 49e5e5f04e60..f19fce557354 100644
--- a/fs/xfs/xfs_handle.c
+++ b/fs/xfs/xfs_handle.c
@@ -85,22 +85,23 @@  xfs_find_handle(
 	int			hsize;
 	xfs_handle_t		handle;
 	struct inode		*inode;
-	struct fd		f = EMPTY_FD;
 	struct path		path;
 	int			error;
 	struct xfs_inode	*ip;
 
 	if (cmd == XFS_IOC_FD_TO_HANDLE) {
-		f = fdget(hreq->fd);
-		if (!fd_file(f))
+		CLASS(fd, f)(hreq->fd);
+
+		if (fd_empty(f))
 			return -EBADF;
-		inode = file_inode(fd_file(f));
+		path = fd_file(f)->f_path;
+		path_get(&path);
 	} else {
 		error = user_path_at(AT_FDCWD, hreq->path, 0, &path);
 		if (error)
 			return error;
-		inode = d_inode(path.dentry);
 	}
+	inode = d_inode(path.dentry);
 	ip = XFS_I(inode);
 
 	/*
@@ -134,10 +135,7 @@  xfs_find_handle(
 	error = 0;
 
  out_put:
-	if (cmd == XFS_IOC_FD_TO_HANDLE)
-		fdput(f);
-	else
-		path_put(&path);
+	path_put(&path);
 	return error;
 }