Attachment 190043 Details for Bug 225423 – patch for 11-CURRENT

[patch] patch for 11-CURRENT

xx (text/plain), 1.23 KB, created by Kirk McKusick on 2018-01-24 22:10:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kirk McKusick

Created: 2018-01-24 22:10:39 UTC

Size: 1.23 KB

patch

obsolete

>Index: sys/kern/vfs_default.c
>===================================================================
>--- sys/kern/vfs_default.c	(revision 328324)
>+++ sys/kern/vfs_default.c	(working copy)
>@@ -629,13 +629,21 @@ vop_stdfsync(ap)
> 		struct thread *a_td;
> 	} */ *ap;
> {
>-	struct vnode *vp = ap->a_vp;
>-	struct buf *bp;
>+	struct vnode *vp;
>+	struct buf *bp, *nbp;
> 	struct bufobj *bo;
>-	struct buf *nbp;
>-	int error = 0;
>-	int maxretry = 1000;     /* large, arbitrarily chosen */
>+	struct mount *mp;
>+	int error, maxretry;
> 
>+	error = 0;
>+	maxretry = 10000;     /* large, arbitrarily chosen */
>+	vp = ap->a_vp;
>+	mp = NULL;
>+	if (vp->v_type == VCHR) {
>+		VI_LOCK(vp);
>+		mp = vp->v_rdev->si_mountpt;
>+		VI_UNLOCK(vp);
>+	}
> 	bo = &vp->v_bufobj;
> 	BO_LOCK(bo);
> loop1:
>@@ -678,6 +686,8 @@ loop2:
> 			bremfree(bp);
> 			bawrite(bp);
> 		}
>+		if (maxretry < 1000)
>+			pause("dirty", hz < 1000 ? 1 : hz / 1000);
> 		BO_LOCK(bo);
> 		goto loop2;
> 	}
>@@ -698,8 +708,9 @@ loop2:
> 			 */
> 			TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs)
> 				if ((error = bp->b_error) == 0)
>-					continue;
>-			if (error == 0 && --maxretry >= 0)
>+					break;
>+			if ((mp != NULL && mp->mnt_secondary_writes > 0) ||
>+			    (error == 0 && --maxretry >= 0))
> 				goto loop1;
> 			error = EAGAIN;
> 		}

Actions: View | Diff

Attachments on bug 225423: 190043 | 190238