simplify xfs_find_handle() a bit

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>

diff --git a/fs/xfs/xfs_handle.c b/fs/xfs/xfs_handle.c
index 49e5e5f04e60339100a67e61a0e21d22f5d48204..f19fce557354eca77d3fd1d4a0ffe573eb1b59f4 100644 (file)
--- 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;
 }