From adbde675ee6979a0de2bf884a71960445199d5a0 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sat, 5 Jun 1999 05:25:37 +0000 Subject: [PATCH] Don't mistake a non-async block that needs to be committed for an interrupted write. Obtained from: fvdl@NetBSD.org via OpenBSD. --- sys/nfs/nfs_bio.c | 4 ++-- sys/nfsclient/nfs_bio.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index c7269efec766..c7029d61667c 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95 - * $Id: nfs_bio.c,v 1.70 1999/05/02 23:56:24 alc Exp $ + * $Id: nfs_bio.c,v 1.71 1999/05/06 20:00:30 phk Exp $ */ @@ -1396,7 +1396,7 @@ nfs_doio(bp, cr, p) bdirty(bp); bp->b_flags &= ~B_DONE; } - if ((bp->b_flags & B_ASYNC) == 0) + if (error && (bp->b_flags & B_ASYNC) == 0) bp->b_flags |= B_EINTR; splx(s); } else { diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index c7269efec766..c7029d61667c 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95 - * $Id: nfs_bio.c,v 1.70 1999/05/02 23:56:24 alc Exp $ + * $Id: nfs_bio.c,v 1.71 1999/05/06 20:00:30 phk Exp $ */ @@ -1396,7 +1396,7 @@ nfs_doio(bp, cr, p) bdirty(bp); bp->b_flags &= ~B_DONE; } - if ((bp->b_flags & B_ASYNC) == 0) + if (error && (bp->b_flags & B_ASYNC) == 0) bp->b_flags |= B_EINTR; splx(s); } else {