svn commit: r357032 - stable/11/sys/kern

[Kirk McKusick]

Author: mckusick
Date: Thu Jan 23 06:18:08 2020
New Revision: 357032
URL: https://svnweb.freebsd.org/changeset/base/357032

Log:
  MFC of 356763
  
  Remove call to VFS_SYNC() to avoid unmount livelock

Modified:
  stable/11/sys/kern/vfs_mount.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/vfs_mount.c
==============================================================================
--- stable/11/sys/kern/vfs_mount.c	Thu Jan 23 06:11:25 2020	(r357031)
+++ stable/11/sys/kern/vfs_mount.c	Thu Jan 23 06:18:08 2020	(r357032)
@@ -1435,9 +1435,7 @@ dounmount(struct mount *mp, int flags, struct thread *
 		}
 		vput(fsrootvp);
 	}
-	if ((mp->mnt_flag & MNT_RDONLY) != 0 || (flags & MNT_FORCE) != 0 ||
-	    (error = VFS_SYNC(mp, MNT_WAIT)) == 0)
-		error = VFS_UNMOUNT(mp, flags);
+	error = VFS_UNMOUNT(mp, flags);
 	vn_finished_write(mp);
 	/*
 	 * If we failed to flush the dirty blocks for this mount point,