svn commit: r306171 - stable/11/sys/ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Thu Sep 22 09:10:30 2016
New Revision: 306171
URL: https://svnweb.freebsd.org/changeset/base/306171

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

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

Modified: stable/11/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- stable/11/sys/ufs/ffs/ffs_softdep.c	Thu Sep 22 09:08:11 2016	(r306170)
+++ stable/11/sys/ufs/ffs/ffs_softdep.c	Thu Sep 22 09:10:30 2016	(r306171)
@@ -12852,6 +12852,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)