diff options
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 6 | ||||
-rw-r--r-- | sys/fs/coda/coda_vfsops.c | 2 | ||||
-rw-r--r-- | sys/fs/fdescfs/fdesc_vfsops.c | 2 | ||||
-rw-r--r-- | sys/fs/hpfs/hpfs_vfsops.c | 6 | ||||
-rw-r--r-- | sys/fs/msdosfs/msdosfs_vfsops.c | 6 | ||||
-rw-r--r-- | sys/fs/ntfs/ntfs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 2 | ||||
-rw-r--r-- | sys/fs/nwfs/nwfs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/fs/portalfs/portal_vfsops.c | 2 | ||||
-rw-r--r-- | sys/fs/pseudofs/pseudofs.c | 2 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/fs/udf/udf_vfsops.c | 4 | ||||
-rw-r--r-- | sys/fs/unionfs/union_vfsops.c | 2 |
13 files changed, 23 insertions, 23 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 2b557a0..651765e 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -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); diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c index 8bbf024..27da6e2 100644 --- a/sys/fs/coda/coda_vfsops.c +++ b/sys/fs/coda/coda_vfsops.c @@ -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; diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 4d86258..5c39978 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -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"); diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c index bb29a83..5d55356 100644 --- a/sys/fs/hpfs/hpfs_vfsops.c +++ b/sys/fs/hpfs/hpfs_vfsops.c @@ -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); diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index cc8b054..e245fb2 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -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); diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c index 9d1f485..10ad461 100644 --- a/sys/fs/ntfs/ntfs_vfsops.c +++ b/sys/fs/ntfs/ntfs_vfsops.c @@ -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); diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 21ee108..02cdc40 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -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); diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c index aad0b99..dada87d 100644 --- a/sys/fs/nwfs/nwfs_vfsops.c +++ b/sys/fs/nwfs/nwfs_vfsops.c @@ -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); diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index 412e81a..f51ee5d 100644 --- a/sys/fs/portalfs/portal_vfsops.c +++ b/sys/fs/portalfs/portal_vfsops.c @@ -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); diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index de0d1f1..eb2d67d 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -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; diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c index 182ba2b..3b73ea3 100644 --- a/sys/fs/smbfs/smbfs_vfsops.c +++ b/sys/fs/smbfs/smbfs_vfsops.c @@ -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); diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index 262e605..59fc449 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -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); diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 3125f59..c9dc884 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -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. |