diff options
| author |   Hao Li <lihao2018.fnst@cn.fujitsu.com> | 2020-12-08 10:08:43 +0800 |
|---|---|---|
| committer |   Al Viro <viro@zeniv.linux.org.uk> | 2020-12-10 17:33:17 -0500 |
| commit | 88149082bb8ef31b289673669e080ec6a00c2e59 (patch) | |
| tree | 27b73fca304245cc58b3baff803a68b21c6afa27 /fs/inode.c | |
| parent | fs/namespace.c: WARN if mnt_count has become negative (diff) | |
| download | linux-dev-88149082bb8ef31b289673669e080ec6a00c2e59.tar.xz linux-dev-88149082bb8ef31b289673669e080ec6a00c2e59.zip | |
fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode()
If generic_drop_inode() returns true, it means iput_final() can evict
this inode regardless of whether it is dirty or not. If we check
I_DONTCACHE in generic_drop_inode(), any inode with this bit set will be
evicted unconditionally. This is not the desired behavior because
I_DONTCACHE only means the inode shouldn't be cached on the LRU list.
As for whether we need to evict this inode, this is what
generic_drop_inode() should do. This patch corrects the usage of
I_DONTCACHE.
This patch was proposed in [1].
[1]: https://lore.kernel.org/linux-fsdevel/20200831003407.GE12096@dread.disaster.area/
Fixes: dae2f8ed7992 ("fs: Lift XFS_IDONTCACHE to the VFS layer")
Signed-off-by: Hao Li <lihao2018.fnst@cn.fujitsu.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index 9d78c37b00b8..5eea9912a0b9 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1627,7 +1627,9 @@ static void iput_final(struct inode *inode) else drop = generic_drop_inode(inode); - if (!drop && (sb->s_flags & SB_ACTIVE)) { + if (!drop && + !(inode->i_state & I_DONTCACHE) && + (sb->s_flags & SB_ACTIVE)) { inode_add_lru(inode); spin_unlock(&inode->i_lock); return; |