diff options
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/isofs/udf/udf_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/fuse/fuse_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/msdosfs/msdosfs_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/ntfs/ntfs_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 4 |
8 files changed, 20 insertions, 18 deletions
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index dca05589a9b..3aef062b318 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vfsops.c,v 1.74 2016/03/14 23:08:06 krw Exp $ */ +/* $OpenBSD: cd9660_vfsops.c,v 1.75 2016/03/17 18:52:31 bluhm Exp $ */ /* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */ /*- @@ -456,7 +456,7 @@ out: if (isomp) { free((caddr_t)isomp, M_ISOFSMNT, 0); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; } return (error); } @@ -588,7 +588,7 @@ cd9660_unmount(mp, mntflags, p) error = VOP_CLOSE(isomp->im_devvp, FREAD, NOCRED, p); vput(isomp->im_devvp); free((caddr_t)isomp, M_ISOFSMNT, 0); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; mp->mnt_flag &= ~MNT_LOCAL; return (error); } diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c index 84939567994..709b7ba327c 100644 --- a/sys/isofs/udf/udf_vfsops.c +++ b/sys/isofs/udf/udf_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vfsops.c,v 1.46 2015/08/31 06:56:25 kettenis Exp $ */ +/* $OpenBSD: udf_vfsops.c,v 1.47 2016/03/17 18:52:31 bluhm Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -495,7 +495,7 @@ udf_unmount(struct mount *mp, int mntflags, struct proc *p) free(ump, M_UDFMOUNT, 0); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; mp->mnt_flag &= ~MNT_LOCAL; return (0); diff --git a/sys/miscfs/fuse/fuse_vfsops.c b/sys/miscfs/fuse/fuse_vfsops.c index 2b99f56cea8..dbf13782084 100644 --- a/sys/miscfs/fuse/fuse_vfsops.c +++ b/sys/miscfs/fuse/fuse_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_vfsops.c,v 1.18 2016/02/25 19:07:45 natano Exp $ */ +/* $OpenBSD: fuse_vfsops.c,v 1.19 2016/03/17 18:52:31 bluhm Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -165,6 +165,7 @@ fusefs_unmount(struct mount *mp, int mntflags, struct proc *p) fuse_device_cleanup(fmp->dev, NULL); fuse_device_set_fmp(fmp, 0); free(fmp, M_FUSEFS, 0); + mp->mnt_data = NULL; return (error); } diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c index a8d6a53f03b..ebe94306d02 100644 --- a/sys/msdosfs/msdosfs_vfsops.c +++ b/sys/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vfsops.c,v 1.73 2015/10/23 17:21:34 krw Exp $ */ +/* $OpenBSD: msdosfs_vfsops.c,v 1.74 2016/03/17 18:52:31 bluhm Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $ */ /*- @@ -590,7 +590,7 @@ error_exit: if (pmp->pm_inusemap) free(pmp->pm_inusemap, M_MSDOSFSFAT, 0); free(pmp, M_MSDOSFSMNT, 0); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; } return (error); } @@ -631,7 +631,7 @@ msdosfs_unmount(struct mount *mp, int mntflags,struct proc *p) vput(vp); free(pmp->pm_inusemap, M_MSDOSFSFAT, 0); free(pmp, M_MSDOSFSMNT, 0); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; mp->mnt_flag &= ~MNT_LOCAL; return (error); } diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index cb9382da19f..5fc858687c5 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vfsops.c,v 1.107 2015/03/14 03:38:52 jsg Exp $ */ +/* $OpenBSD: nfs_vfsops.c,v 1.108 2016/03/17 18:52:31 bluhm Exp $ */ /* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */ /* @@ -702,6 +702,7 @@ nfs_unmount(struct mount *mp, int mntflags, struct proc *p) m_freem(nmp->nm_nam); timeout_del(&nmp->nm_rtimeout); free(nmp, M_NFSMNT, sizeof(*nmp)); + mp->mnt_data = NULL; return (0); } diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c index e3137681965..cbca872b51a 100644 --- a/sys/ntfs/ntfs_vfsops.c +++ b/sys/ntfs/ntfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_vfsops.c,v 1.46 2016/03/05 20:40:05 natano Exp $ */ +/* $OpenBSD: ntfs_vfsops.c,v 1.47 2016/03/17 18:52:31 bluhm Exp $ */ /* $NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $ */ /*- @@ -532,10 +532,10 @@ ntfs_unmount(struct mount *mp, int mntflags, struct proc *p) ntfs_toupper_unuse(p); DPRINTF("ntfs_unmount: freeing memory...\n"); - mp->mnt_data = NULL; - mp->mnt_flag &= ~MNT_LOCAL; free(ntmp->ntm_ad, M_NTFSMNT, 0); free(ntmp, M_NTFSMNT, 0); + mp->mnt_data = NULL; + mp->mnt_flag &= ~MNT_LOCAL; return (error); } diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c index 4acfa333d58..f7dab095bbd 100644 --- a/sys/ufs/ext2fs/ext2fs_vfsops.c +++ b/sys/ufs/ext2fs/ext2fs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vfsops.c,v 1.86 2016/02/27 18:50:38 natano Exp $ */ +/* $OpenBSD: ext2fs_vfsops.c,v 1.87 2016/03/17 18:52:31 bluhm Exp $ */ /* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */ /* @@ -602,7 +602,7 @@ out: if (ump) { free(ump->um_e2fs, M_UFSMNT, sizeof *ump->um_e2fs); free(ump, M_UFSMNT, sizeof *ump); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; } return (error); } @@ -642,7 +642,7 @@ ext2fs_unmount(struct mount *mp, int mntflags, struct proc *p) free(fs->e2fs_gd, M_UFSMNT, gdescs_space); free(fs, M_UFSMNT, sizeof *fs); free(ump, M_UFSMNT, sizeof *ump); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; mp->mnt_flag &= ~MNT_LOCAL; return (error); } diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 5b605ef4a8f..8c8106ce607 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.152 2016/02/27 18:50:38 natano Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.153 2016/03/17 18:52:32 bluhm Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -1033,7 +1033,7 @@ ffs_unmount(struct mount *mp, int mntflags, struct proc *p) free(fs->fs_csp, M_UFSMNT, 0); free(fs, M_UFSMNT, fs->fs_sbsize); free(ump, M_UFSMNT, sizeof(*ump)); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; mp->mnt_flag &= ~MNT_LOCAL; return (error); } |