]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
9p: v9fs_fid_find: also lookup by inode if not found dentry
authorDominique Martinet <asmadeus@codewreck.org>
Thu, 23 May 2024 11:31:38 +0000 (20:31 +0900)
committerDominique Martinet <asmadeus@codewreck.org>
Sun, 22 Sep 2024 20:51:27 +0000 (05:51 +0900)
It's possible for v9fs_fid_find "find by dentry" branch to not turn up
anything despite having an entry set (because e.g. uid doesn't match),
in which case the calling code will generally make an extra lookup
to the server.

In this case we might have had better luck looking by inode, so fall
back to look up by inode if we have one and the lookup by dentry failed.

Message-Id: <20240523210024.1214386-1-asmadeus@codewreck.org>
Reviewed-by: Christian Schoenebeck <linux_oss@crudebyte.com>
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
fs/9p/fid.c

index de009a33e0e26d7b0cdfa6794fbc218b63fc0059..f84412290a30cf8019e24defeb9301f910371a50 100644 (file)
@@ -131,10 +131,9 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)
                        }
                }
                spin_unlock(&dentry->d_lock);
-       } else {
-               if (dentry->d_inode)
-                       ret = v9fs_fid_find_inode(dentry->d_inode, false, uid, any);
        }
+       if (!ret && dentry->d_inode)
+               ret = v9fs_fid_find_inode(dentry->d_inode, false, uid, any);
 
        return ret;
 }