[src/trunk]: src/sys Fix xxx_strategy() to use the vnode arg instead of bp->b...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fb0870301abb
branches:  trunk
changeset: 558031:fb0870301abb
user:      hannken <hannken%NetBSD.org@localhost>
date:      Mon Jan 26 10:39:29 2004 +0000

description:
Fix xxx_strategy() to use the vnode arg instead of bp->b_vp.

diffstat:

 sys/fs/adosfs/advnops.c            |  7 ++++---
 sys/fs/cd9660/cd9660_vnops.c       |  7 ++++---
 sys/fs/filecorefs/filecore_vnops.c |  7 ++++---
 sys/fs/msdosfs/msdosfs_vnops.c     |  9 +++++----
 sys/fs/ntfs/ntfs_vnops.c           |  7 ++++---
 sys/fs/smbfs/smbfs_vnops.c         |  9 +++++----
 sys/ufs/lfs/lfs_vnops.c            |  7 ++++---
 sys/ufs/ufs/ufs_vnops.c            |  7 ++++---
 8 files changed, 34 insertions(+), 26 deletions(-)

diffs (266 lines):

diff -r 065c4f2470ea -r fb0870301abb sys/fs/adosfs/advnops.c
--- a/sys/fs/adosfs/advnops.c   Mon Jan 26 10:02:31 2004 +0000
+++ b/sys/fs/adosfs/advnops.c   Mon Jan 26 10:39:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: advnops.c,v 1.7 2004/01/25 18:06:48 hannken Exp $      */
+/*     $NetBSD: advnops.c,v 1.8 2004/01/26 10:39:29 hannken Exp $      */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.7 2004/01/25 18:06:48 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.8 2004/01/26 10:39:29 hannken Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -381,6 +381,7 @@
        void *v;
 {
        struct vop_strategy_args /* {
+               struct vnode *a_vp;
                struct buf *a_bp;
        } */ *sp = v;
        struct buf *bp;
@@ -398,7 +399,7 @@
                error = EIO;
                goto reterr;
        }
-       vp = bp->b_vp;
+       vp = sp->a_vp;
        ap = VTOA(vp);
        if (bp->b_blkno == bp->b_lblkno) {
                error = VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL);
diff -r 065c4f2470ea -r fb0870301abb sys/fs/cd9660/cd9660_vnops.c
--- a/sys/fs/cd9660/cd9660_vnops.c      Mon Jan 26 10:02:31 2004 +0000
+++ b/sys/fs/cd9660/cd9660_vnops.c      Mon Jan 26 10:39:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660_vnops.c,v 1.7 2004/01/25 18:06:48 hannken Exp $ */
+/*     $NetBSD: cd9660_vnops.c,v 1.8 2004/01/26 10:39:30 hannken Exp $ */
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.7 2004/01/25 18:06:48 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.8 2004/01/26 10:39:30 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -745,10 +745,11 @@
        void *v;
 {
        struct vop_strategy_args /* {
+               struct vnode *a_vp;
                struct buf *a_bp;
        } */ *ap = v;
        struct buf *bp = ap->a_bp;
-       struct vnode *vp = bp->b_vp;
+       struct vnode *vp = ap->a_vp;
        struct iso_node *ip;
        int error;
 
diff -r 065c4f2470ea -r fb0870301abb sys/fs/filecorefs/filecore_vnops.c
--- a/sys/fs/filecorefs/filecore_vnops.c        Mon Jan 26 10:02:31 2004 +0000
+++ b/sys/fs/filecorefs/filecore_vnops.c        Mon Jan 26 10:39:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filecore_vnops.c,v 1.7 2004/01/25 18:06:48 hannken Exp $       */
+/*     $NetBSD: filecore_vnops.c,v 1.8 2004/01/26 10:39:30 hannken Exp $       */
 
 /*-
  * Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.7 2004/01/25 18:06:48 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.8 2004/01/26 10:39:30 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -442,10 +442,11 @@
        void *v;
 {
        struct vop_strategy_args /* {
+               struct vnode *a_vp;
                struct buf *a_bp;
        } */ *ap = v;
        struct buf *bp = ap->a_bp;
-       struct vnode *vp = bp->b_vp;
+       struct vnode *vp = ap->a_vp;
        struct filecore_node *ip;
        int error;
 
diff -r 065c4f2470ea -r fb0870301abb sys/fs/msdosfs/msdosfs_vnops.c
--- a/sys/fs/msdosfs/msdosfs_vnops.c    Mon Jan 26 10:02:31 2004 +0000
+++ b/sys/fs/msdosfs/msdosfs_vnops.c    Mon Jan 26 10:39:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdosfs_vnops.c,v 1.8 2004/01/25 18:06:48 hannken Exp $        */
+/*     $NetBSD: msdosfs_vnops.c,v 1.9 2004/01/26 10:39:30 hannken Exp $        */
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.8 2004/01/25 18:06:48 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.9 2004/01/26 10:39:30 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1736,14 +1736,15 @@
        void *v;
 {
        struct vop_strategy_args /* {
+               struct vnode *a_vp;
                struct buf *a_bp;
        } */ *ap = v;
+       struct vnode *vp = ap->a_vp;
        struct buf *bp = ap->a_bp;
        struct denode *dep = VTODE(bp->b_vp);
-       struct vnode *vp;
        int error = 0;
 
-       if (bp->b_vp->v_type == VBLK || bp->b_vp->v_type == VCHR)
+       if (vp->v_type == VBLK || vp->v_type == VCHR)
                panic("msdosfs_strategy: spec");
        /*
         * If we don't already know the filesystem relative block number
diff -r 065c4f2470ea -r fb0870301abb sys/fs/ntfs/ntfs_vnops.c
--- a/sys/fs/ntfs/ntfs_vnops.c  Mon Jan 26 10:02:31 2004 +0000
+++ b/sys/fs/ntfs/ntfs_vnops.c  Mon Jan 26 10:39:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntfs_vnops.c,v 1.15 2003/10/06 16:47:10 jdolecek Exp $ */
+/*     $NetBSD: ntfs_vnops.c,v 1.16 2004/01/26 10:39:30 hannken Exp $  */
 
 /*
  * Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.15 2003/10/06 16:47:10 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.16 2004/01/26 10:39:30 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -321,11 +321,12 @@
 int
 ntfs_strategy(ap)
        struct vop_strategy_args /* {
+               struct vnode *a_vp;
                struct buf *a_bp;
        } */ *ap;
 {
        struct buf *bp = ap->a_bp;
-       struct vnode *vp = bp->b_vp;
+       struct vnode *vp = ap->a_vp;
        struct fnode *fp = VTOF(vp);
        struct ntnode *ip = FTONT(fp);
        struct ntfsmount *ntmp = ip->i_mp;
diff -r 065c4f2470ea -r fb0870301abb sys/fs/smbfs/smbfs_vnops.c
--- a/sys/fs/smbfs/smbfs_vnops.c        Mon Jan 26 10:02:31 2004 +0000
+++ b/sys/fs/smbfs/smbfs_vnops.c        Mon Jan 26 10:39:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs_vnops.c,v 1.29 2003/10/25 08:42:08 christos Exp $        */
+/*     $NetBSD: smbfs_vnops.c,v 1.30 2004/01/26 10:39:30 hannken Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.29 2003/10/25 08:42:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.30 2004/01/26 10:39:30 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -956,9 +956,10 @@
        void *v;
 {
        struct vop_strategy_args /* {
-       struct buf *a_bp
+               struct vnode *a_vp;
+               struct buf *a_bp;
        } */ *ap = v;
-       struct buf *bp=ap->a_bp;
+       struct buf *bp = ap->a_bp;
        struct ucred *cr;
        struct proc *p;
        int error = 0;
diff -r 065c4f2470ea -r fb0870301abb sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Mon Jan 26 10:02:31 2004 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Mon Jan 26 10:39:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.127 2004/01/25 18:06:49 hannken Exp $  */
+/*     $NetBSD: lfs_vnops.c,v 1.128 2004/01/26 10:39:30 hannken Exp $  */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.127 2004/01/25 18:06:49 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.128 2004/01/26 10:39:30 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1025,6 +1025,7 @@
 lfs_strategy(void *v)
 {
        struct vop_strategy_args /* {
+               struct vnode *a_vp;
                struct buf *a_bp;
        } */ *ap = v;
        struct buf      *bp;
@@ -1035,7 +1036,7 @@
        int             i, sn, error, slept;
 
        bp = ap->a_bp;
-       vp = bp->b_vp;
+       vp = ap->a_vp;
        ip = VTOI(vp);
        fs = ip->i_lfs;
 
diff -r 065c4f2470ea -r fb0870301abb sys/ufs/ufs/ufs_vnops.c
--- a/sys/ufs/ufs/ufs_vnops.c   Mon Jan 26 10:02:31 2004 +0000
+++ b/sys/ufs/ufs/ufs_vnops.c   Mon Jan 26 10:39:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_vnops.c,v 1.112 2004/01/26 10:02:31 hannken Exp $  */
+/*     $NetBSD: ufs_vnops.c,v 1.113 2004/01/26 10:39:30 hannken Exp $  */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993, 1995
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.112 2004/01/26 10:02:31 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.113 2004/01/26 10:39:30 hannken Exp $");
 
 #ifndef _LKM
 #include "opt_quota.h"
@@ -1700,6 +1700,7 @@
 ufs_strategy(void *v)
 {
        struct vop_strategy_args /* {
+               struct vnode *a_vp;
                struct buf *a_bp;
        } */ *ap = v;
        struct buf      *bp;
@@ -1708,7 +1709,7 @@
        int             error;
 
        bp = ap->a_bp;
-       vp = bp->b_vp;
+       vp = ap->a_vp;
        ip = VTOI(vp);
        if (vp->v_type == VBLK || vp->v_type == VCHR)
                panic("ufs_strategy: spec");