diff options
| author | Doug Rabson <dfr@FreeBSD.org> | 1997-03-04 17:59:42 +0000 |
|---|---|---|
| committer | Doug Rabson <dfr@FreeBSD.org> | 1997-03-04 17:59:42 +0000 |
| commit | 8081bf16e2f7eb466d51c58e5fa3c37285a57cb3 (patch) | |
| tree | cecb4003a217a052a349faa62b275c2221a6d548 | |
| parent | 9f21280deebb939ed716dd367645435714dfb596 (diff) | |
Notes
| -rw-r--r-- | sys/nfs/nfs_bio.c | 4 | ||||
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 3aabb1de28a3..37a7a00d6c7a 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94 - * $Id: nfs_bio.c,v 1.28.2.1 1996/11/09 21:10:49 phk Exp $ + * $Id: nfs_bio.c,v 1.28.2.2 1996/11/12 09:09:27 phk Exp $ */ #include <sys/param.h> @@ -972,7 +972,7 @@ nfs_doio(bp, cr, p) bp->b_flags |= B_WRITEINPROG; error = nfs_writerpc(vp, uiop, cr, &iomode, &must_commit); if (!error && iomode == NFSV3WRITE_UNSTABLE) - bp->b_flags |= B_NEEDCOMMIT; + bp->b_flags |= B_NEEDCOMMIT | B_CLUSTEROK; else bp->b_flags &= ~B_NEEDCOMMIT; bp->b_flags &= ~B_WRITEINPROG; diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 2f059f10f978..c779a99503f9 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.5 (Berkeley) 2/13/94 - * $Id: nfs_vnops.c,v 1.36.2.1 1996/11/09 21:11:07 phk Exp $ + * $Id: nfs_vnops.c,v 1.36.2.2 1997/01/07 06:18:27 wpaul Exp $ */ /* @@ -3131,7 +3131,8 @@ nfs_writebp(bp, force) * an actual write will have to be scheduled via. VOP_STRATEGY(). * If B_WRITEINPROG is already set, then push it with a write anyhow. */ - if (oldflags & (B_NEEDCOMMIT | B_WRITEINPROG) == B_NEEDCOMMIT) { + vfs_busy_pages(bp, 1); + if ((oldflags & (B_NEEDCOMMIT | B_WRITEINPROG)) == B_NEEDCOMMIT) { off = ((u_quad_t)bp->b_blkno) * DEV_BSIZE + bp->b_dirtyoff; bp->b_flags |= B_WRITEINPROG; retv = nfs_commit(bp->b_vp, off, bp->b_dirtyend-bp->b_dirtyoff, @@ -3147,7 +3148,6 @@ nfs_writebp(bp, force) if (retv) { if (force) bp->b_flags |= B_WRITEINPROG; - vfs_busy_pages(bp, 1); VOP_STRATEGY(bp); } |