d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of qaddr_t.

Browse Source 
Requested by: bde
This commit is contained in:
alfred 2007-10-16 10:54:55 +00:00
parent 3dcb842f61
commit 3a60df401c
19 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/fs/cd9660/cd9660_vfsops.c
View File

@ -375,7 +375,7 @@ iso_mountfs(devvp, mp, td)
brelse(pribp);
pribp = NULL;
mp->mnt_data = (qaddr_t)isomp;
mp->mnt_data = isomp;
mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
mp->mnt_maxsymlinklen = 0;
@ -488,7 +488,7 @@ out:
}
if (isomp) {
free((caddr_t)isomp, M_ISOFSMNT);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
}
return error;
}
@ -530,7 +530,7 @@ cd9660_unmount(mp, mntflags, td)
PICKUP_GIANT();
vrele(isomp->im_devvp);
free((caddr_t)isomp, M_ISOFSMNT);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
MNT_ILOCK(mp);
mp->mnt_flag &= ~MNT_LOCAL;
MNT_IUNLOCK(mp);

2
sys/fs/coda/coda_vfsops.c
View File

@ -168,7 +168,7 @@ coda_mount(struct mount *vfsp, struct thread *td)
}
/* No initialization (here) of mi_vcomm! */
vfsp->mnt_data = (qaddr_t)mi;
vfsp->mnt_data = mi;
vfs_getnewfsid (vfsp);
mi->mi_vfsp = vfsp;

2
sys/fs/fdescfs/fdesc_vfsops.c
View File

@ -96,7 +96,7 @@ fdesc_mount(struct mount *mp, struct thread *td)
fmp->f_root = rvp;
/* XXX -- don't mark as local to work around fts() problems */
/*mp->mnt_flag |= MNT_LOCAL;*/
mp->mnt_data = (qaddr_t) fmp;
mp->mnt_data = fmp;
vfs_getnewfsid(mp);
vfs_mountedfrom(mp, "fdescfs");

6
sys/fs/hpfs/hpfs_vfsops.c
View File

@ -281,7 +281,7 @@ hpfs_mountfs(devvp, mp, td)
goto failed;
}
mp->mnt_data = (qaddr_t)hpmp;
mp->mnt_data = hpmp;
hpmp->hpm_devvp = devvp;
hpmp->hpm_dev = devvp->v_rdev;
hpmp->hpm_mp = mp;
@ -322,7 +322,7 @@ hpfs_mountfs(devvp, mp, td)
failed:
if (bp)
brelse (bp);
mp->mnt_data = (qaddr_t)NULL;
mp->mnt_data = NULL;
g_vfs_close(cp, td);
return (error);
}
@ -359,7 +359,7 @@ hpfs_unmount(
dprintf(("hpfs_umount: freeing memory...\n"));
hpfs_cpdeinit(hpmp);
hpfs_bmdeinit(hpmp);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
MNT_ILOCK(mp);
mp->mnt_flag &= ~MNT_LOCAL;
MNT_IUNLOCK(mp);

6
sys/fs/msdosfs/msdosfs_vfsops.c
View File

@ -719,7 +719,7 @@ mountmsdosfs(struct vnode *devvp, struct mount *mp, struct thread *td)
goto error_exit;
pmp->pm_fmod = 1;
}
mp->mnt_data = (qaddr_t) pmp;
mp->mnt_data = pmp;
mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
MNT_ILOCK(mp);
@ -745,7 +745,7 @@ error_exit:
if (pmp->pm_inusemap)
free(pmp->pm_inusemap, M_MSDOSFSFAT);
free(pmp, M_MSDOSFSMNT);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
}
return (error);
}
@ -811,7 +811,7 @@ msdosfs_unmount(struct mount *mp, int mntflags, struct thread *td)
msdosfs_fileno_free(mp);
}
free(pmp, M_MSDOSFSMNT);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
MNT_ILOCK(mp);
mp->mnt_flag &= ~MNT_LOCAL;
MNT_IUNLOCK(mp);

4
sys/fs/ntfs/ntfs_vfsops.c
View File

@ -353,7 +353,7 @@ ntfs_mountfs(devvp, mp, td)
else
ntfs_u28_init(ntmp, ntmp->ntm_82u, cs_local, cs_ntfs);
mp->mnt_data = (qaddr_t)ntmp;
mp->mnt_data = ntmp;
dprintf(("ntfs_mountfs(): case-%s,%s uid: %d, gid: %d, mode: %o\n",
(ntmp->ntm_flag & NTFS_MFLAG_CASEINS)?"insens.":"sens.",
@ -521,7 +521,7 @@ ntfs_unmount(
dprintf(("ntfs_umount: freeing memory...\n"));
ntfs_u28_uninit(ntmp);
ntfs_82u_uninit(ntmp);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
MNT_ILOCK(mp);
mp->mnt_flag &= ~MNT_LOCAL;
MNT_IUNLOCK(mp);

2
sys/fs/nullfs/null_vfsops.c
View File

@ -185,7 +185,7 @@ nullfs_mount(struct mount *mp, struct thread *td)
MNT_ILOCK(mp);
mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE;
MNT_IUNLOCK(mp);
mp->mnt_data = (qaddr_t) xmp;
mp->mnt_data = xmp;
vfs_getnewfsid(mp);
vfs_mountedfrom(mp, target);

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

@ -198,7 +198,7 @@ static int nwfs_mount(struct mount *mp, struct thread *td)
error = ENOMEM;
goto bad;
}
mp->mnt_data = (qaddr_t)nmp;
mp->mnt_data = nmp;
nmp->connh = handle;
nmp->n_root = NULL;
nmp->n_id = nwfsid++;
@ -263,7 +263,7 @@ nwfs_unmount(struct mount *mp, int mntflags, struct thread *td)
if(ncp_conn_free(conn))
ncp_conn_unlock(conn, td);
}
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
if (nmp->m.flags & NWFS_MOUNT_HAVE_NLS)
free(nmp->m.nls.to_lower, M_NWFSDATA);
free(nmp, M_NWFSDATA);

2
sys/fs/portalfs/portal_vfsops.c
View File

@ -156,7 +156,7 @@ portal_mount(struct mount *mp, struct thread *td)
MNT_ILOCK(mp);
mp->mnt_flag |= MNT_LOCAL;
MNT_IUNLOCK(mp);
mp->mnt_data = (qaddr_t) fmp;
mp->mnt_data = fmp;
vfs_getnewfsid(mp);
vfs_mountedfrom(mp, p);

2
sys/fs/pseudofs/pseudofs.c
View File

@ -310,7 +310,7 @@ pfs_mount(struct pfs_info *pi, struct mount *mp, struct thread *td)
mp->mnt_flag |= MNT_LOCAL;
mp->mnt_kern_flag |= MNTK_MPSAFE;
MNT_IUNLOCK(mp);
mp->mnt_data = (qaddr_t)pi;
mp->mnt_data = pi;
vfs_getnewfsid(mp);
sbp = &mp->mnt_stat;

4
sys/fs/smbfs/smbfs_vfsops.c
View File

@ -188,7 +188,7 @@ smbfs_mount(struct mount *mp, struct thread *td)
goto bad;
}
bzero(smp, sizeof(*smp));
mp->mnt_data = (qaddr_t)smp;
mp->mnt_data = smp;
smp->sm_hash = hashinit(desiredvnodes, M_SMBFSHASH, &smp->sm_hashlen);
if (smp->sm_hash == NULL)
goto bad;
@ -308,7 +308,7 @@ smbfs_unmount(struct mount *mp, int mntflags, struct thread *td)
if (error)
return error;
smb_share_put(smp->sm_share, &scred);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
if (smp->sm_hash)
free(smp->sm_hash, M_SMBFSHASH);

4
sys/fs/udf/udf_vfsops.c
View File

@ -339,7 +339,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp, struct thread *td) {
goto bail;
}
mp->mnt_data = (qaddr_t)udfmp;
mp->mnt_data = udfmp;
mp->mnt_stat.f_fsid.val[0] = dev2udev(devvp->v_rdev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
MNT_ILOCK(mp);
@ -534,7 +534,7 @@ udf_unmount(struct mount *mp, int mntflags, struct thread *td)
FREE(udfmp, M_UDFMOUNT);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
MNT_ILOCK(mp);
mp->mnt_flag &= ~MNT_LOCAL;
MNT_IUNLOCK(mp);

2
sys/fs/unionfs/union_vfsops.c
View File

@ -309,7 +309,7 @@ unionfs_domount(struct mount *mp, struct thread *td)
(upperrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE))
mp->mnt_kern_flag |= MNTK_MPSAFE;
MNT_IUNLOCK(mp);
mp->mnt_data = (qaddr_t)ump;
mp->mnt_data = ump;
/*
* Copy upper layer's RDONLY flag.

6
sys/gnu/fs/ext2fs/ext2_vfsops.c
View File

@ -687,7 +687,7 @@ ext2_mountfs(devvp, mp, td)
fs->s_dirt = 1; /* mark it modified */
fs->s_es->s_state &= ~EXT2_VALID_FS; /* set fs invalid */
}
mp->mnt_data = (qaddr_t)ump;
mp->mnt_data = ump;
mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
mp->mnt_maxsymlinklen = EXT2_MAXSYMLINKLEN;
@ -722,7 +722,7 @@ out:
bsd_free(ump->um_e2fs->s_es, M_EXT2MNT);
bsd_free(ump->um_e2fs, M_EXT2MNT);
bsd_free(ump, M_EXT2MNT);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
}
return (error);
}
@ -780,7 +780,7 @@ ext2_unmount(mp, mntflags, td)
bsd_free(fs->s_es, M_EXT2MNT);
bsd_free(fs, M_EXT2MNT);
bsd_free(ump, M_EXT2MNT);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
MNT_ILOCK(mp);
mp->mnt_flag &= ~MNT_LOCAL;
MNT_IUNLOCK(mp);

4
sys/gnu/fs/reiserfs/reiserfs_vfsops.c
View File

@ -239,7 +239,7 @@ reiserfs_unmount(struct mount *mp, int mntflags, struct thread *td)
rmp = NULL;
}
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = 0;
MNT_ILOCK(mp);
mp->mnt_flag &= ~MNT_LOCAL;
MNT_IUNLOCK(mp);
@ -598,7 +598,7 @@ reiserfs_mountfs(struct vnode *devvp, struct mount *mp, struct thread *td)
else
bit_set(&(sbi->s_properties), REISERFS_3_6);
mp->mnt_data = (qaddr_t)rmp;
mp->mnt_data = rmp;
mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
MNT_ILOCK(mp);

2
sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c
View File

@ -241,7 +241,7 @@ vfs_allocate(struct mount *mp)
bhv_head_init(VFS_BHVHEAD(vfsp), "vfs");
xmp->m_mp = mp;
mp->mnt_data = (qaddr_t)xmp;
mp->mnt_data = xmp;
vfsp->vfs_mp = mp;
return vfsp;

2
sys/nfs4client/nfs4_vfsops.c
View File

@ -559,7 +559,7 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct sockaddr *nam,
nmp = uma_zalloc(nfsmount_zone, M_WAITOK);
bzero((caddr_t)nmp, sizeof (struct nfsmount));
TAILQ_INIT(&nmp->nm_bufq);
mp->mnt_data = (qaddr_t)nmp;
mp->mnt_data = nmp;
}
vfs_getnewfsid(mp);

2
sys/nfsclient/nfs_vfsops.c
View File

@ -850,7 +850,7 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct sockaddr *nam,
nmp = uma_zalloc(nfsmount_zone, M_WAITOK);
bzero((caddr_t)nmp, sizeof (struct nfsmount));
TAILQ_INIT(&nmp->nm_bufq);
mp->mnt_data = (qaddr_t)nmp;
mp->mnt_data = nmp;
}
vfs_getnewfsid(mp);
nmp->nm_mountp = mp;

6
sys/ufs/ffs/ffs_vfsops.c
View File

@ -788,7 +788,7 @@ ffs_mountfs(devvp, mp, td)
fs->fs_contigdirs = (u_int8_t *)space;
bzero(fs->fs_contigdirs, size);
fs->fs_active = NULL;
mp->mnt_data = (qaddr_t)ump;
mp->mnt_data = ump;
mp->mnt_stat.f_fsid.val[0] = fs->fs_id[0];
mp->mnt_stat.f_fsid.val[1] = fs->fs_id[1];
nmp = NULL;
@ -902,7 +902,7 @@ out:
}
free(ump->um_fs, M_UFSMNT);
free(ump, M_UFSMNT);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
}
return (error);
}
@ -1066,7 +1066,7 @@ ffs_unmount(mp, mntflags, td)
free(fs->fs_csp, M_UFSMNT);
free(fs, M_UFSMNT);
free(ump, M_UFSMNT);
mp->mnt_data = (qaddr_t)0;
mp->mnt_data = NULL;
MNT_ILOCK(mp);
mp->mnt_flag &= ~MNT_LOCAL;
MNT_IUNLOCK(mp);