| From 657951a65589b9a361352affa82d50f2af956559 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 28 Feb 2024 16:50:49 +0100 |
| Subject: fuse: don't unhash root |
| |
| From: Miklos Szeredi <mszeredi@redhat.com> |
| |
| [ Upstream commit b1fe686a765e6c0d71811d825b5a1585a202b777 ] |
| |
| The root inode is assumed to be always hashed. Do not unhash the root |
| inode even if it is marked BAD. |
| |
| Fixes: 5d069dbe8aaf ("fuse: fix bad inode") |
| Cc: <stable@vger.kernel.org> # v5.11 |
| Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/fuse/fuse_i.h | 1 - |
| fs/fuse/inode.c | 7 +++++-- |
| 2 files changed, 5 insertions(+), 3 deletions(-) |
| |
| diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h |
| index bcbe344888627..20924e799c9f5 100644 |
| --- a/fs/fuse/fuse_i.h |
| +++ b/fs/fuse/fuse_i.h |
| @@ -940,7 +940,6 @@ static inline bool fuse_stale_inode(const struct inode *inode, int generation, |
| |
| static inline void fuse_make_bad(struct inode *inode) |
| { |
| - remove_inode_hash(inode); |
| set_bit(FUSE_I_BAD, &get_fuse_inode(inode)->state); |
| } |
| |
| diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c |
| index 516ea2979a90f..f73865751c732 100644 |
| --- a/fs/fuse/inode.c |
| +++ b/fs/fuse/inode.c |
| @@ -469,8 +469,11 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid, |
| } else if (fuse_stale_inode(inode, generation, attr)) { |
| /* nodeid was reused, any I/O on the old inode should fail */ |
| fuse_make_bad(inode); |
| - iput(inode); |
| - goto retry; |
| + if (inode != d_inode(sb->s_root)) { |
| + remove_inode_hash(inode); |
| + iput(inode); |
| + goto retry; |
| + } |
| } |
| fi = get_fuse_inode(inode); |
| spin_lock(&fi->lock); |
| -- |
| 2.43.0 |
| |