mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

Explicitly pass the vnode to the nw_doio() function.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2004-09-07 08:53:03 +00:00
parent 6de9bf776e
commit 7ee3985c57
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=134896
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/nwfs/nwfs.h
View File

@ -75,7 +75,7 @@ struct nwmount {
int ncp_conn_logged_in(struct nwmount *);
int nwfs_ioctl(struct vop_ioctl_args *ap);
int nwfs_doio(struct buf *bp, struct ucred *cr, struct thread *td);
int nwfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td);
int nwfs_vinvalbuf(struct vnode *vp, int flags, struct ucred *cred,
struct thread *td, int intrflg);
#endif /* _KERNEL */

5
sys/fs/nwfs/nwfs_io.c
View File

@ -260,20 +260,19 @@ nwfs_writevnode(vp, uiop, cred, ioflag)
* Do an I/O operation to/from a cache block.
*/
int
nwfs_doio(bp, cr, td)
nwfs_doio(vp, bp, cr, td)
struct vnode *vp;
struct buf *bp;
struct ucred *cr;
struct thread *td;
{
struct uio *uiop;
struct vnode *vp;
struct nwnode *np;
struct nwmount *nmp;
int error = 0;
struct uio uio;
struct iovec io;
vp = bp->b_vp;
np = VTONW(vp);
nmp = VFSTONWFS(vp->v_mount);
uiop = &uio;

4
sys/fs/nwfs/nwfs_vnops.c
View File

@ -796,8 +796,6 @@ static int nwfs_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));
NCPVNDEBUG("\n");
if (bp->b_flags & B_ASYNC)
td = (struct thread *)0;
@ -813,7 +811,7 @@ static int nwfs_strategy (ap)
* otherwise just do it ourselves.
*/
if ((bp->b_flags & B_ASYNC) == 0 )
error = nwfs_doio(bp, cr, td);
error = nwfs_doio(ap->a_vp, bp, cr, td);
return (error);
}