summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruanmeisi <ruan.meisi@zte.com.cn>2023-04-25 19:13:54 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-09-19 12:20:27 +0200
commit3856e7b11810ced2edfeb1e91a64690805f24264 (patch)
tree4ca408ce65f1abd04638c2c45838c43aea565198
parent1d21b03f773846b133bd2634ae2c131a3dbaa4f1 (diff)
downloadlinux-3856e7b11810ced2edfeb1e91a64690805f24264.tar.gz
linux-3856e7b11810ced2edfeb1e91a64690805f24264.tar.bz2
linux-3856e7b11810ced2edfeb1e91a64690805f24264.zip
fuse: nlookup missing decrement in fuse_direntplus_link
commit b8bd342d50cbf606666488488f9fea374aceb2d5 upstream. During our debugging of glusterfs, we found an Assertion failed error: inode_lookup >= nlookup, which was caused by the nlookup value in the kernel being greater than that in the FUSE file system. The issue was introduced by fuse_direntplus_link, where in the function, fuse_iget increments nlookup, and if d_splice_alias returns failure, fuse_direntplus_link returns failure without decrementing nlookup https://github.com/gluster/glusterfs/pull/4081 Signed-off-by: ruanmeisi <ruan.meisi@zte.com.cn> Fixes: 0b05b18381ee ("fuse: implement NFS-like readdirplus support") Cc: <stable@vger.kernel.org> # v3.9 Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/fuse/readdir.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/fuse/readdir.c b/fs/fuse/readdir.c
index d5294e663df5..14e99ffa57af 100644
--- a/fs/fuse/readdir.c
+++ b/fs/fuse/readdir.c
@@ -243,8 +243,16 @@ retry:
dput(dentry);
dentry = alias;
}
- if (IS_ERR(dentry))
+ if (IS_ERR(dentry)) {
+ if (!IS_ERR(inode)) {
+ struct fuse_inode *fi = get_fuse_inode(inode);
+
+ spin_lock(&fi->lock);
+ fi->nlookup--;
+ spin_unlock(&fi->lock);
+ }
return PTR_ERR(dentry);
+ }
}
if (fc->readdirplus_auto)
set_bit(FUSE_I_INIT_RDPLUS, &get_fuse_inode(inode)->state);