Fix mfs_strategy() to use the vp argument.
From YAMAMOTO Takashi <yamt@netbsd.org>.
This commit is contained in:
parent
1a8a5d7903
commit
84b45bc333
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: mfs_vnops.c,v 1.35 2003/12/28 00:36:33 dbj Exp $ */
|
||||
/* $NetBSD: mfs_vnops.c,v 1.36 2004/01/26 10:02:31 hannken Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mfs_vnops.c,v 1.35 2003/12/28 00:36:33 dbj Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mfs_vnops.c,v 1.36 2004/01/26 10:02:31 hannken Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -138,14 +138,15 @@ mfs_strategy(v)
|
||||
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 mfsnode *mfsp;
|
||||
struct vnode *vp;
|
||||
struct proc *p = curproc; /* XXX */
|
||||
|
||||
if (!vfinddev(bp->b_dev, VBLK, &vp) || vp->v_usecount == 0)
|
||||
if (vp->v_type != VBLK || vp->v_usecount == 0)
|
||||
panic("mfs_strategy: bad dev");
|
||||
mfsp = VTOMFS(vp);
|
||||
/* check for mini-root access */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ufs_vnops.c,v 1.111 2004/01/26 04:25:02 itojun Exp $ */
|
||||
/* $NetBSD: ufs_vnops.c,v 1.112 2004/01/26 10:02:31 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.111 2004/01/26 04:25:02 itojun Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.112 2004/01/26 10:02:31 hannken Exp $");
|
||||
|
||||
#ifndef _LKM
|
||||
#include "opt_quota.h"
|
||||
@ -1730,7 +1730,6 @@ ufs_strategy(void *v)
|
||||
return (0);
|
||||
}
|
||||
vp = ip->i_devvp;
|
||||
bp->b_dev = vp->v_rdev;
|
||||
return (VOP_STRATEGY(vp, bp));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user