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

[Konstantin Belousov]

Author: kib
Date: Thu Sep 22 10:53:13 2016
New Revision: 306181
URL: https://svnweb.freebsd.org/changeset/base/306181

Log:
  MFC r305599:
  Do not leak transient ENOLCK error from flush_newblk_dep() loop.

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	Thu Sep 22 10:51:47 2016	(r306180)
+++ stable/10/sys/ufs/ffs/ffs_softdep.c	Thu Sep 22 10:53:13 2016	(r306181)
@@ -12843,6 +12843,7 @@ flush_newblk_dep(vp, mp, lbn)
 			    LK_INTERLOCK, BO_LOCKPTR(bo));
 			if (error == ENOLCK) {
 				ACQUIRE_LOCK(ump);
+				error = 0;
 				continue; /* Slept, retry */
 			}
 			if (error != 0)