From 5df766a0f8bb66f325b7d378a18c0dc1d094a6e9 Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 20 Mar 2000 11:29:10 +0000 Subject: Rename the existing BUF_STRATEGY() to DEV_STRATEGY() substitute BUF_WRITE(foo) for VOP_BWRITE(foo->b_vp, foo) substitute BUF_STRATEGY(foo) for VOP_STRATEGY(foo->b_vp, foo) This patch is machine generated except for the ccd.c and buf.h parts. --- sys/nfs/nfs_bio.c | 4 ++-- sys/nfs/nfs_serv.c | 2 +- sys/nfs/nfs_vnops.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/nfs') diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index b137fe8..b9c3e28 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -994,7 +994,7 @@ again: if (bp->b_dirtyend > 0 && (on > bp->b_dirtyend || (on + n) < bp->b_dirtyoff)) { - if (VOP_BWRITE(bp->b_vp, bp) == EINTR) + if (BUF_WRITE(bp) == EINTR) return (EINTR); goto again; } @@ -1063,7 +1063,7 @@ again: if ((np->n_flag & NQNFSNONCACHE) || (ioflag & IO_SYNC)) { if (ioflag & IO_INVAL) bp->b_flags |= B_NOCACHE; - error = VOP_BWRITE(bp->b_vp, bp); + error = BUF_WRITE(bp); if (error) break; if (np->n_flag & NQNFSNONCACHE) { diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 0d28670..8e38202 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -3668,7 +3668,7 @@ nfsrv_commit(nfsd, slp, procp, mrq) } bremfree(bp); bp->b_flags &= ~B_ASYNC; - VOP_BWRITE(bp->b_vp, bp); + BUF_WRITE(bp); ++nfs_commit_miss; } ++nfs_commit_blks; diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 0dbbe09..2a36195 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -2986,7 +2986,7 @@ loop: else bp->b_flags |= B_ASYNC | B_WRITEINPROG; splx(s); - VOP_BWRITE(bp->b_vp, bp); + BUF_WRITE(bp); goto loop; } splx(s); @@ -3127,7 +3127,7 @@ nfs_writebp(bp, force, procp) if (force) bp->b_flags |= B_WRITEINPROG; BUF_KERNPROC(bp); - VOP_STRATEGY(bp->b_vp, bp); + BUF_STRATEGY(bp); if( (oldflags & B_ASYNC) == 0) { int rtval = biowait(bp); -- cgit v1.1