svn commit: r297307 - stable/10/sys/ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Sun Mar 27 08:00:51 2016
New Revision: 297307
URL: https://svnweb.freebsd.org/changeset/base/297307

Log:
  MFC r297206:
  Fix locking mistake in softdep_waitidle().

Modified:
  stable/10/sys/ufs/ffs/ffs_softdep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- stable/10/sys/ufs/ffs/ffs_softdep.c	Sun Mar 27 07:34:42 2016	(r297306)
+++ stable/10/sys/ufs/ffs/ffs_softdep.c	Sun Mar 27 08:00:51 2016	(r297307)
@@ -1937,9 +1937,9 @@ softdep_waitidle(struct mount *mp, int f
 		vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_FSYNC(devvp, MNT_WAIT, td);
 		VOP_UNLOCK(devvp, 0);
+		ACQUIRE_LOCK(ump);
 		if (error != 0)
 			break;
-		ACQUIRE_LOCK(ump);
 	}
 	ump->softdep_req = 0;
 	if (i == SU_WAITIDLE_RETRIES && error == 0 && ump->softdep_deps != 0) {