From b1cb363c11fe0753b0a91c7fb65146e140dffaf5 Mon Sep 17 00:00:00 2001 From: hannken Date: Sun, 25 Jan 2004 18:02:03 +0000 Subject: [PATCH] Make VOP_STRATEGY(bp) a real VOP as discussed on tech-kern. VOP_STRATEGY(bp) is replaced by one of two new functions: - VOP_STRATEGY(vp, bp) Call the strategy routine of vp for bp. - DEV_STRATEGY(bp) Call the d_strategy routine of bp->b_dev for bp. DEV_STRATEGY(bp) is used only for block-to-block device situations. --- sys/kern/vfs_bio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 38aba6175bba..51dd997fa293 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_bio.c,v 1.111 2004/01/19 11:57:42 yamt Exp $ */ +/* $NetBSD: vfs_bio.c,v 1.112 2004/01/25 18:02:04 hannken Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -81,7 +81,7 @@ #include "opt_softdep.h" #include -__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.111 2004/01/19 11:57:42 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.112 2004/01/25 18:02:04 hannken Exp $"); #include #include @@ -505,7 +505,7 @@ bio_doread(struct vnode *vp, daddr_t blkno, int size, struct ucred *cred, BIO_SETPRIO(bp, BPRIO_TIMELIMITED); else BIO_SETPRIO(bp, BPRIO_TIMECRITICAL); - VOP_STRATEGY(bp); + VOP_STRATEGY(vp, bp); /* Pay for the read. */ p->p_stats->p_ru.ru_inblock++; @@ -650,7 +650,7 @@ bwrite(struct buf *bp) else BIO_SETPRIO(bp, BPRIO_TIMELIMITED); - VOP_STRATEGY(bp); + VOP_STRATEGY(vp, bp); if (sync) { /* If I/O was synchronous, wait for it to complete. */