[Devel] [PATCH RHEL8 COMMIT] Revert "fs/nfs: don't use delayed unmount for nfs."

[Konstantin Khorenko]

The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.35
------>
commit 110ebd57a13b579dabb7ee9aff8db21f73bd67f0
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Mon Jun 7 16:07:03 2021 +0300

    Revert "fs/nfs: don't use delayed unmount for nfs."
    
    This reverts commit d7ab92b772a59be999ca44df8871a0306f1a51a3.
    
    Reverted due to https://jira.sw.ru/browse/PSBM-130309
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 fs/namespace.c     | 3 +--
 fs/nfs/super.c     | 1 -
 include/linux/fs.h | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index feee87d3c89a..02cbb14350df 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1204,8 +1204,7 @@ static void mntput_no_expire(struct mount *mnt)
 	}
 	unlock_mount_hash();
 
-	if (likely(!(mnt->mnt.mnt_flags & MNT_INTERNAL))
-	    && !(mnt->mnt.mnt_sb->s_iflags & SB_I_UMOUNT_SYNC)) {
+	if (likely(!(mnt->mnt.mnt_flags & MNT_INTERNAL))) {
 		struct task_struct *task = current;
 		if (likely(!(task->flags & PF_KTHREAD))) {
 			init_task_work(&mnt->mnt_rcu, __cleanup_mnt);
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index ec023ddea295..f8cc797c162a 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2488,7 +2488,6 @@ static int nfs_set_super(struct super_block *s, void *data)
 	int ret;
 
 	s->s_flags = sb_mntdata->mntflags;
-	s->s_iflags |= SB_I_UMOUNT_SYNC;
 	s->s_fs_info = server;
 	s->s_d_op = server->nfs_client->rpc_ops->dentry_ops;
 	ret = set_anon_super(s, server);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 654b73c520a8..0a54b95dc1b4 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1362,7 +1362,6 @@ extern int send_sigurg(struct fown_struct *fown);
 #define SB_I_IMA_UNVERIFIABLE_SIGNATURE	0x00000020
 #define SB_I_UNTRUSTED_MOUNTER		0x00000040
 
-#define SB_I_UMOUNT_SYNC		0x10000000 /* don't use delayed unmount */
 extern struct list_head super_blocks;
 extern spinlock_t sb_lock;