Unverified Commit a81d020c authored Nov 13, 2024 by openeuler-ci-bot Committed by Gitee Nov 13, 2024

!13138 fs: call fsnotify_sb_delete after evict_inodes

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/54TZ5ZVEMBTBZTKYNDCJQBCR562DMJBG/ 
 
https://gitee.com/openeuler/kernel/issues/IB3D4A 
 
Link:https://gitee.com/openeuler/kernel/pulls/13138

 

Reviewed-by: zhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: Yuan Can <yuancan@huawei.com>
Signed-off-by: Yuan Can <yuancan@huawei.com>

parents d047cc72 2bdc6578

fs/notify/fsnotify.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,9 @@ void fsnotify_unmount_inodes(struct super_block *sb)
		* doing an __iget/iput with SB_ACTIVE clear would actually
		* evict all inodes with zero i_count from icache which is
		* unnecessarily violent and may in fact be illegal to do.
		* However, we should have been called /after/ evict_inodes
		* removed all zero refcount inodes, in any case. Test to
		* be sure.
		*/
		if (!atomic_read(&inode->i_count)) {
		spin_unlock(&inode->i_lock);

fs/super.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -442,10 +442,12 @@ void generic_shutdown_super(struct super_block *sb)
		sync_filesystem(sb);
		sb->s_flags &= ~SB_ACTIVE;

		fsnotify_unmount_inodes(sb);
		cgroup_writeback_umount();

		/* evict all inodes with zero refcount */
		evict_inodes(sb);
		/* only nonzero refcount inodes can have marks */
		fsnotify_unmount_inodes(sb);

		if (sb->s_dio_done_wq) {
		destroy_workqueue(sb->s_dio_done_wq);