diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1997-02-28 17:56:27 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1997-02-28 17:56:27 +0000 |
| commit | 2ca8d1319588f482d157ef369c230067ce63f9b4 (patch) | |
| tree | 59b854b17ba1e6b1422ba4264bcd7b8a044c191b | |
| parent | 85cf4b8e562e666c1fefc207be883b11bab2d5ba (diff) | |
Notes
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 7 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 031d2bf0f44f..ae6238b0434d 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id$ + * $Id: nfs_vnops.c,v 1.42 1997/02/22 09:42:46 peter Exp $ */ @@ -2917,9 +2917,6 @@ loop: } } if (vp->v_dirtyblkhd.lh_first && commit) { -#ifndef DIAGNOSTIC - vprint("nfs_fsync: dirty", vp); -#endif goto loop; } } @@ -3128,6 +3125,7 @@ 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. */ + 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; @@ -3144,7 +3142,6 @@ nfs_writebp(bp, force) if (retv) { if (force) bp->b_flags |= B_WRITEINPROG; - vfs_busy_pages(bp, 1); VOP_STRATEGY(bp); } diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 031d2bf0f44f..ae6238b0434d 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id$ + * $Id: nfs_vnops.c,v 1.42 1997/02/22 09:42:46 peter Exp $ */ @@ -2917,9 +2917,6 @@ loop: } } if (vp->v_dirtyblkhd.lh_first && commit) { -#ifndef DIAGNOSTIC - vprint("nfs_fsync: dirty", vp); -#endif goto loop; } } @@ -3128,6 +3125,7 @@ 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. */ + 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; @@ -3144,7 +3142,6 @@ nfs_writebp(bp, force) if (retv) { if (force) bp->b_flags |= B_WRITEINPROG; - vfs_busy_pages(bp, 1); VOP_STRATEGY(bp); } |