svn commit: r360029 - stable/12/sys/ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Fri Apr 17 01:06:51 2020
New Revision: 360029
URL: https://svnweb.freebsd.org/changeset/base/360029

Log:
  MFC r359766:
  ufs: apply suspension for non-forced rw unmounts.

Modified:
  stable/12/sys/ufs/ffs/ffs_vfsops.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/12/sys/ufs/ffs/ffs_vfsops.c	Thu Apr 16 23:31:39 2020	(r360028)
+++ stable/12/sys/ufs/ffs/ffs_vfsops.c	Fri Apr 17 01:06:51 2020	(r360029)
@@ -1225,11 +1225,9 @@ ffs_unmount(mp, mntflags)
 	flags = 0;
 	td = curthread;
 	fs = ump->um_fs;
-	susp = 0;
-	if (mntflags & MNT_FORCE) {
+	if (mntflags & MNT_FORCE)
 		flags |= FORCECLOSE;
-		susp = fs->fs_ronly == 0;
-	}
+	susp = fs->fs_ronly == 0;
 #ifdef UFS_EXTATTR
 	if ((error = ufs_extattr_stop(mp, td))) {
 		if (error != EOPNOTSUPP)