summaryrefslogtreecommitdiffstats
path: root/fs/9p/fid.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-11-17 15:08:59 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-11-17 15:08:59 +0100
commit8bdd75d4a6f9680d77c703b07b8fb7a539a52766 (patch)
tree18075fe1080e73efc3247d6818c0e74e6a96b941 /fs/9p/fid.c
parent0e651c03eabd082f8b8e16cd2da9664740899796 (diff)
parentc1036e4f14d03aba549cdd9b186148d331013056 (diff)
downloadlinux-stable-8bdd75d4a6f9680d77c703b07b8fb7a539a52766.tar.gz
linux-stable-8bdd75d4a6f9680d77c703b07b8fb7a539a52766.tar.bz2
linux-stable-8bdd75d4a6f9680d77c703b07b8fb7a539a52766.zip
Merge v6.6.62linux-rolling-lts
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/9p/fid.c')
-rw-r--r--fs/9p/fid.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/9p/fid.c b/fs/9p/fid.c
index de009a33e0e2..f84412290a30 100644
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -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;
}