summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-06-05 05:25:37 +0000
committerpeter <peter@FreeBSD.org>1999-06-05 05:25:37 +0000
commit486459045470f6c024b357b301ce2f043f1b4eab (patch)
tree5f254b794a60e2ef0912d6d56dbfdf38423220b1
parenteba3d08af07abb7fff289c7622ac947a1b5f260b (diff)
downloadFreeBSD-src-486459045470f6c024b357b301ce2f043f1b4eab.zip
FreeBSD-src-486459045470f6c024b357b301ce2f043f1b4eab.tar.gz
Don't mistake a non-async block that needs to be committed for an
interrupted write. Obtained from: fvdl@NetBSD.org via OpenBSD.
-rw-r--r--sys/nfs/nfs_bio.c4
-rw-r--r--sys/nfsclient/nfs_bio.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index c7269ef..c7029d6 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 c7269ef..c7029d6 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 {
OpenPOWER on IntegriCloud