diff options
| author | phk <phk@FreeBSD.org> | 2004-12-12 12:02:34 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-12 12:02:34 +0000 |
| commit | 60aefa93100da1db3df39a23ee6569f9f62a1d4c (patch) | |
| tree | b10484b93e351c5119a13efe304d09b8b2b025af /sys/fs/ntfs/ntfs_vnops.c | |
| parent | e37de0d950874075236809754c4ce642102b8fd2 (diff) | |
| download | FreeBSD-src-60aefa93100da1db3df39a23ee6569f9f62a1d4c.zip FreeBSD-src-60aefa93100da1db3df39a23ee6569f9f62a1d4c.tar.gz | |
Don't deref NULL if no charset-conversion is specified.
Return correct vnode in vop_bmap()
Diffstat (limited to 'sys/fs/ntfs/ntfs_vnops.c')
| -rw-r--r-- | sys/fs/ntfs/ntfs_vnops.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c index 700fd1a..cf2e17d 100644 --- a/sys/fs/ntfs/ntfs_vnops.c +++ b/sys/fs/ntfs/ntfs_vnops.c @@ -97,9 +97,14 @@ ntfs_bmap(ap) int *a_runb; } */ *ap; { + struct vnode *vp = ap->a_vp; + struct fnode *fp = VTOF(vp); + struct ntnode *ip = FTONT(fp); + struct ntfsmount *ntmp = ip->i_mp; + dprintf(("ntfs_bmap: vn: %p, blk: %d\n", ap->a_vp,(u_int32_t)ap->a_bn)); if (ap->a_bop != NULL) - *ap->a_bop = &ap->a_vp->v_bufobj; + *ap->a_bop = &ntmp->ntm_devvp->v_bufobj; if (ap->a_bnp != NULL) *ap->a_bnp = ap->a_bn; if (ap->a_runp != NULL) |
