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

[Konstantin Belousov]

Author: kib
Date: Wed Jun 10 02:14:33 2015
New Revision: 284201
URL: https://svnweb.freebsd.org/changeset/base/284201

Log:
  MFC r283968:
  Syncing a directory vnode might drop the vnode lock in the
  softdep_sync() similarly to the regular vnode sync.  Allow retry for
  both vnode types.

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

Modified: stable/10/sys/ufs/ffs/ffs_vnops.c
==============================================================================
--- stable/10/sys/ufs/ffs/ffs_vnops.c	Wed Jun 10 02:12:01 2015	(r284200)
+++ stable/10/sys/ufs/ffs/ffs_vnops.c	Wed Jun 10 02:14:33 2015	(r284201)
@@ -200,8 +200,8 @@ retry:
 		 * bo_dirty list. Recheck and resync as needed.
 		 */
 		BO_LOCK(bo);
-		if (vp->v_type == VREG && (bo->bo_numoutput > 0 ||
-		    bo->bo_dirty.bv_cnt > 0)) {
+		if ((vp->v_type == VREG || vp->v_type == VDIR) &&
+		    (bo->bo_numoutput > 0 || bo->bo_dirty.bv_cnt > 0)) {
 			BO_UNLOCK(bo);
 			goto retry;
 		}