diff options
author | phk <phk@FreeBSD.org> | 2004-09-07 08:53:28 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-09-07 08:53:28 +0000 |
commit | 766dd89a4b5b33be85a83493fb186af6a581812c (patch) | |
tree | 600c137cf18d5042dead7808c13a997ee9173353 /sys/fs/smbfs | |
parent | 6dd3840f3a6bfaffc38aa09c6cb22e3f9b1837c8 (diff) | |
download | FreeBSD-src-766dd89a4b5b33be85a83493fb186af6a581812c.zip FreeBSD-src-766dd89a4b5b33be85a83493fb186af6a581812c.tar.gz |
Explicitly pass vnode to smbfs_doio() function.
Diffstat (limited to 'sys/fs/smbfs')
-rw-r--r-- | sys/fs/smbfs/smbfs.h | 2 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_io.c | 3 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_vnops.c | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sys/fs/smbfs/smbfs.h b/sys/fs/smbfs/smbfs.h index 5048791..1b9b9ca 100644 --- a/sys/fs/smbfs/smbfs.h +++ b/sys/fs/smbfs/smbfs.h @@ -98,7 +98,7 @@ struct smbmount { #define VTOSMBFS(vp) (VFSTOSMBFS(VTOVFS(vp))) int smbfs_ioctl(struct vop_ioctl_args *ap); -int smbfs_doio(struct buf *bp, struct ucred *cr, struct thread *td); +int smbfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td); int smbfs_vinvalbuf(struct vnode *vp, int flags, struct ucred *cred, struct thread *td, int intrflg); #endif /* KERNEL */ diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index 6a1ea45..752e858 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -303,9 +303,8 @@ smbfs_writevnode(struct vnode *vp, struct uio *uiop, * Do an I/O operation to/from a cache block. */ int -smbfs_doio(struct buf *bp, struct ucred *cr, struct thread *td) +smbfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td) { - struct vnode *vp = bp->b_vp; struct smbmount *smp = VFSTOSMBFS(vp->v_mount); struct smbnode *np = VTOSMB(vp); struct uio uio, *uiop = &uio; diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index c051b69..e899aab 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -854,8 +854,6 @@ smbfs_strategy (ap) struct thread *td; int error = 0; - KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)", - __func__, ap->a_vp, ap->a_bp->b_vp)); SMBVDEBUG("\n"); if (bp->b_flags & B_ASYNC) td = (struct thread *)0; @@ -867,7 +865,7 @@ smbfs_strategy (ap) cr = bp->b_wcred; if ((bp->b_flags & B_ASYNC) == 0 ) - error = smbfs_doio(bp, cr, td); + error = smbfs_doio(ap->a_vp, bp, cr, td); return error; } |