diff options
author | phk <phk@FreeBSD.org> | 2003-01-03 06:32:15 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2003-01-03 06:32:15 +0000 |
commit | daf6948653371fc707e009c01cb68aaf25092743 (patch) | |
tree | c1a67015350cd075392cc71ce5ac0f487b1e3711 | |
parent | cd377db9e281126ef0a7198c61f61ba5ebfea726 (diff) | |
download | FreeBSD-src-daf6948653371fc707e009c01cb68aaf25092743.zip FreeBSD-src-daf6948653371fc707e009c01cb68aaf25092743.tar.gz |
Convert calls to BUF_STRATEGY to VOP_STRATEGY calls. This is a no-op since
all BUF_STRATEGY did in the first place was call VOP_STRATEGY.
-rw-r--r-- | sys/fs/specfs/spec_vnops.c | 2 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_bmap.c | 2 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_bmap.c | 2 | ||||
-rw-r--r-- | sys/kern/vfs_bio.c | 2 | ||||
-rw-r--r-- | sys/nfsclient/nfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/sys/buf.h | 2 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 2 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_bmap.c | 2 | ||||
-rw-r--r-- | sys/vm/swap_pager.c | 8 | ||||
-rw-r--r-- | sys/vm/vm_swap.c | 2 | ||||
-rw-r--r-- | sys/vm/vnode_pager.c | 4 |
11 files changed, 14 insertions, 16 deletions
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index ec5cc46..09860dd 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -869,7 +869,7 @@ spec_getpages(ap) cnt.v_vnodepgsin += pcount; /* Do the input. */ - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); s = splbio(); diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c index 31ed99b..69a069f 100644 --- a/sys/gnu/ext2fs/ext2_bmap.c +++ b/sys/gnu/ext2fs/ext2_bmap.c @@ -196,7 +196,7 @@ ext2_bmaparray(vp, bn, bnp, runp, runb) bp->b_flags &= ~B_INVAL; bp->b_ioflags &= ~BIO_ERROR; vfs_busy_pages(bp, 0); - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); curproc->p_stats->p_ru.ru_inblock++; /* XXX */ error = bufwait(bp); if (error) { diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c index 31ed99b..69a069f 100644 --- a/sys/gnu/fs/ext2fs/ext2_bmap.c +++ b/sys/gnu/fs/ext2fs/ext2_bmap.c @@ -196,7 +196,7 @@ ext2_bmaparray(vp, bn, bnp, runp, runb) bp->b_flags &= ~B_INVAL; bp->b_ioflags &= ~BIO_ERROR; vfs_busy_pages(bp, 0); - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); curproc->p_stats->p_ru.ru_inblock++; /* XXX */ error = bufwait(bp); if (error) { diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 336ca3f..cc5ee29 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -855,7 +855,7 @@ bwrite(struct buf * bp) splx(s); if (oldflags & B_ASYNC) BUF_KERNPROC(bp); - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); if ((oldflags & B_ASYNC) == 0) { int rtval = bufwait(bp); diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index ad5c357..51148d6 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -2952,7 +2952,7 @@ nfs_writebp(struct buf *bp, int force, struct thread *td) if (force) bp->b_flags |= B_WRITEINPROG; BUF_KERNPROC(bp); - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); if( (oldflags & B_ASYNC) == 0) { int rtval = bufwait(bp); diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 17dfb40..6764ca0 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -401,8 +401,6 @@ struct cluster_save { #define BUF_WRITE(bp) \ (bp)->b_op->bop_write(bp) -#define BUF_STRATEGY(bp) VOP_STRATEGY((bp)->b_vp, (bp)) - static __inline void buf_start(struct buf *bp) { diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 79586a8..ed4e04c 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -559,7 +559,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp) panic("ffs_indirtrunc: bad buffer size"); bp->b_blkno = dbn; vfs_busy_pages(bp, 0); - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); error = bufwait(bp); } if (error) { diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 731354e..4630b68 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -226,7 +226,7 @@ ufs_bmaparray(vp, bn, bnp, nbp, runp, runb) bp->b_flags &= ~B_INVAL; bp->b_ioflags &= ~BIO_ERROR; vfs_busy_pages(bp, 0); - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); curproc->p_stats->p_ru.ru_inblock++; /* XXX */ error = bufwait(bp); if (error) { diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 78d9849..5771a9c 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1143,7 +1143,7 @@ swap_pager_getpages(object, m, count, reqpage) * NOTE: b_blkno is destroyed by the call to VOP_STRATEGY */ BUF_KERNPROC(bp); - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); /* * wait for the page we want to complete. PG_SWAPINPROG is always @@ -1390,7 +1390,7 @@ swap_pager_putpages(object, m, count, sync, rtvals) if (sync == FALSE) { bp->b_iodone = swp_pager_async_iodone; BUF_KERNPROC(bp); - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); for (j = 0; j < n; ++j) rtvals[i+j] = VM_PAGER_PEND; @@ -1404,7 +1404,7 @@ swap_pager_putpages(object, m, count, sync, rtvals) * NOTE: b_blkno is destroyed by the call to VOP_STRATEGY */ bp->b_iodone = swp_pager_sync_iodone; - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); /* * Wait for the sync I/O to complete, then update rtvals. @@ -2176,7 +2176,7 @@ flushchainbuf(struct buf *nbp) if (nbp->b_iocmd == BIO_WRITE) nbp->b_dirtyend = nbp->b_bcount; BUF_KERNPROC(nbp); - BUF_STRATEGY(nbp); + VOP_STRATEGY(nbp->b_vp, nbp); } else { bufdone(nbp); } diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 0ec5220..5e488c9 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -163,7 +163,7 @@ swapdev_strategy(ap) } bp->b_vp = sp->sw_vp; splx(s); - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); return 0; } diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 667bd3a..63da3ca 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -493,7 +493,7 @@ vnode_pager_input_smlfs(object, m) runningbufspace += bp->b_runningbufspace; /* do the input */ - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); /* we definitely need to be at splvm here */ @@ -823,7 +823,7 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage) cnt.v_vnodepgsin += count; /* do the input */ - BUF_STRATEGY(bp); + VOP_STRATEGY(bp->b_vp, bp); s = splvm(); /* we definitely need to be at splvm here */ |