From 41e0c475e03118d236d2b4e4eeb2c4f27929a31d Mon Sep 17 00:00:00 2001 From: guenther Date: Sat, 13 Aug 2016 20:53:17 +0000 Subject: [PATCH] Eliminate pointless casts to qaddr_t of a value being assigned to a void* ok kettenis@ krw@ natano@ dlg@ espie@ --- sys/isofs/cd9660/cd9660_vfsops.c | 4 ++-- sys/isofs/udf/udf_vfsops.c | 4 ++-- sys/msdosfs/msdosfs_vfsops.c | 4 ++-- sys/nfs/nfs_vfsops.c | 4 ++-- sys/ntfs/ntfs_vfsops.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 98531665816..6066fe2890d 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.80 2016/06/19 11:54:33 natano Exp $ */ +/* $OpenBSD: cd9660_vfsops.c,v 1.81 2016/08/13 20:53:17 guenther Exp $ */ /* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */ /*- @@ -380,7 +380,7 @@ iso_mountfs(devvp, mp, p, argp) brelse(pribp); pribp = NULL; - mp->mnt_data = (qaddr_t)isomp; + mp->mnt_data = isomp; mp->mnt_stat.f_fsid.val[0] = (long)dev; mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; mp->mnt_stat.f_namemax = NAME_MAX; diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c index d776a67a5b5..7bd25d816a1 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.52 2016/06/19 11:54:33 natano Exp $ */ +/* $OpenBSD: udf_vfsops.c,v 1.53 2016/08/13 20:53:17 guenther Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long @@ -261,7 +261,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp, uint32_t lb, struct proc *p) ump = malloc(sizeof(*ump), M_UDFMOUNT, M_WAITOK | M_ZERO); - mp->mnt_data = (qaddr_t) ump; + mp->mnt_data = ump; mp->mnt_stat.f_fsid.val[0] = devvp->v_rdev; mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; mp->mnt_stat.f_namemax = NAME_MAX; diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c index 01b90342d53..94724f51159 100644 --- a/sys/msdosfs/msdosfs_vfsops.c +++ b/sys/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vfsops.c,v 1.78 2016/05/22 20:27:04 bluhm Exp $ */ +/* $OpenBSD: msdosfs_vfsops.c,v 1.79 2016/08/13 20:53:17 guenther Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $ */ /*- @@ -566,7 +566,7 @@ msdosfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, pmp->pm_flags |= MSDOSFSMNT_RONLY; else pmp->pm_fmod = 1; - mp->mnt_data = (qaddr_t)pmp; + mp->mnt_data = pmp; mp->mnt_stat.f_fsid.val[0] = (long)dev; mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; #ifdef QUOTA diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 79eb8726b5a..ce4c66a873e 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vfsops.c,v 1.109 2016/04/26 18:37:03 natano Exp $ */ +/* $OpenBSD: nfs_vfsops.c,v 1.110 2016/08/13 20:53:17 guenther Exp $ */ /* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */ /* @@ -623,7 +623,7 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct mbuf *nam, } else { nmp = malloc(sizeof(*nmp), M_NFSMNT, M_WAITOK|M_ZERO); - mp->mnt_data = (qaddr_t)nmp; + mp->mnt_data = nmp; } vfs_getnewfsid(mp); diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c index bae57b58da8..8666d6de710 100644 --- a/sys/ntfs/ntfs_vfsops.c +++ b/sys/ntfs/ntfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_vfsops.c,v 1.52 2016/06/19 11:54:33 natano Exp $ */ +/* $OpenBSD: ntfs_vfsops.c,v 1.53 2016/08/13 20:53:17 guenther Exp $ */ /* $NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $ */ /*- @@ -345,7 +345,7 @@ ntfs_mountfs(struct vnode *devvp, struct mount *mp, struct ntfs_args *argsp, ntmp->ntm_gid = argsp->gid; ntmp->ntm_mode = argsp->mode; ntmp->ntm_flag = argsp->flag; - mp->mnt_data = (qaddr_t) ntmp; + mp->mnt_data = ntmp; TAILQ_INIT(&ntmp->ntm_ntnodeq); /* set file name encode/decode hooks XXX utf-8 only for now */ -- 2.20.1