Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Die, qaddr_t, die! - mnt_data in struct mount is already...



details:   https://anonhg.NetBSD.org/src/rev/858d4594f5ef
branches:  trunk
changeset: 534594:858d4594f5ef
user:      soren <soren%NetBSD.org@localhost>
date:      Tue Jul 30 07:40:07 2002 +0000

description:
Die, qaddr_t, die! - mnt_data in struct mount is already effectively
a void *, so stop pretending otherwise.

diffstat:

 sys/adosfs/advfsops.c               |   8 ++++----
 sys/coda/coda_vfsops.c              |   6 +++---
 sys/coda/coda_vnops.c               |   6 +++---
 sys/filecorefs/filecore_vfsops.c    |  10 +++++-----
 sys/fs/smbfs/smbfs_vfsops.c         |   6 +++---
 sys/isofs/cd9660/cd9660_vfsops.c    |  10 +++++-----
 sys/miscfs/fdesc/fdesc_vfsops.c     |   6 +++---
 sys/miscfs/kernfs/kernfs_vfsops.c   |   6 +++---
 sys/miscfs/nullfs/null_vfsops.c     |   6 +++---
 sys/miscfs/overlay/overlay_vfsops.c |   6 +++---
 sys/miscfs/portal/portal_vfsops.c   |   6 +++---
 sys/miscfs/procfs/procfs_vfsops.c   |   6 +++---
 sys/miscfs/umapfs/umap_vfsops.c     |   6 +++---
 sys/miscfs/union/union_vfsops.c     |   6 +++---
 sys/msdosfs/msdosfs_vfsops.c        |  10 +++++-----
 sys/nfs/nfs_vfsops.c                |   6 +++---
 sys/ntfs/ntfs_vfsops.c              |   8 ++++----
 sys/sys/mount.h                     |   4 ++--
 sys/ufs/ext2fs/ext2fs_vfsops.c      |  10 +++++-----
 sys/ufs/ffs/ffs_vfsops.c            |  10 +++++-----
 sys/ufs/lfs/lfs_vfsops.c            |  10 +++++-----
 21 files changed, 76 insertions(+), 76 deletions(-)

diffs (truncated from 687 to 300 lines):

diff -r df950502f0e2 -r 858d4594f5ef sys/adosfs/advfsops.c
--- a/sys/adosfs/advfsops.c     Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/adosfs/advfsops.c     Tue Jul 30 07:40:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: advfsops.c,v 1.52 2002/05/14 00:05:56 matt Exp $       */
+/*     $NetBSD: advfsops.c,v 1.53 2002/07/30 07:40:07 soren Exp $      */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.52 2002/05/14 00:05:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.53 2002/07/30 07:40:07 soren Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -250,7 +250,7 @@
        amp->dbsize = amp->bsize - (IS_FFS(amp) ? 0 : OFS_DATA_OFFSET);
        amp->devvp = devvp;
        
-       mp->mnt_data = (qaddr_t)amp;
+       mp->mnt_data = amp;
         mp->mnt_stat.f_fsid.val[0] = (long)devvp->v_rdev;
         mp->mnt_stat.f_fsid.val[1] = makefstype(MOUNT_ADOSFS);
        mp->mnt_fs_bshift = ffs(amp->bsize) - 1;
@@ -328,7 +328,7 @@
        if (amp->bitmap)
                free(amp->bitmap, M_ADOSFSBITMAP);
        free(amp, M_ADOSFSMNT);
-       mp->mnt_data = (qaddr_t)0;
+       mp->mnt_data = NULL;
        mp->mnt_flag &= ~MNT_LOCAL;
        return (error);
 }
diff -r df950502f0e2 -r 858d4594f5ef sys/coda/coda_vfsops.c
--- a/sys/coda/coda_vfsops.c    Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/coda/coda_vfsops.c    Tue Jul 30 07:40:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: coda_vfsops.c,v 1.16 2002/03/27 05:10:41 phil Exp $    */
+/*     $NetBSD: coda_vfsops.c,v 1.17 2002/07/30 07:40:16 soren Exp $   */
 
 /*
  * 
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.16 2002/03/27 05:10:41 phil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.17 2002/07/30 07:40:16 soren Exp $");
 
 #ifdef _LKM
 #define        NVCODA 4
@@ -218,7 +218,7 @@
     }
     
     /* No initialization (here) of mi_vcomm! */
-    vfsp->mnt_data = (qaddr_t)mi;
+    vfsp->mnt_data = mi;
     vfsp->mnt_stat.f_fsid.val[0] = 0;
     vfsp->mnt_stat.f_fsid.val[1] = makefstype(MOUNT_CODA);
     mi->mi_vfsp = vfsp;
diff -r df950502f0e2 -r 858d4594f5ef sys/coda/coda_vnops.c
--- a/sys/coda/coda_vnops.c     Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/coda/coda_vnops.c     Tue Jul 30 07:40:07 2002 +0000
@@ -6,7 +6,7 @@
 rmdir
 symlink
 */
-/*     $NetBSD: coda_vnops.c,v 1.30 2001/12/06 04:27:40 chs Exp $      */
+/*     $NetBSD: coda_vnops.c,v 1.31 2002/07/30 07:40:17 soren Exp $    */
 
 /*
  * 
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.30 2001/12/06 04:27:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.31 2002/07/30 07:40:17 soren Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -870,7 +870,7 @@
 
     /* Remove it from the table so it can't be found. */
     coda_unsave(cp);
-    if ((struct coda_mntinfo *)(vp->v_mount->mnt_data) == NULL) {
+    if (vp->v_mount->mnt_data == NULL) {
        myprintf(("Help! vfsp->vfs_data was NULL, but vnode %p wasn't dying\n", vp));
        panic("badness in coda_inactive\n");
     }
diff -r df950502f0e2 -r 858d4594f5ef sys/filecorefs/filecore_vfsops.c
--- a/sys/filecorefs/filecore_vfsops.c  Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/filecorefs/filecore_vfsops.c  Tue Jul 30 07:40:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filecore_vfsops.c,v 1.18 2001/11/12 23:04:11 lukem Exp $       */
+/*     $NetBSD: filecore_vfsops.c,v 1.19 2002/07/30 07:40:08 soren Exp $       */
 
 /*-
  * Copyright (c) 1998 Andrew McMurry
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.18 2001/11/12 23:04:11 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.19 2002/07/30 07:40:08 soren Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -327,7 +327,7 @@
        brelse(bp);
        bp = NULL;
 
-       mp->mnt_data = (qaddr_t)fcmp;
+       mp->mnt_data = fcmp;
        mp->mnt_stat.f_fsid.val[0] = (long)dev;
        mp->mnt_stat.f_fsid.val[1] = makefstype(MOUNT_FILECORE);
        mp->mnt_maxsymlinklen = 0;
@@ -360,7 +360,7 @@
        VOP_UNLOCK(devvp, 0);
        if (fcmp) {
                free((caddr_t)fcmp, M_FILECOREMNT);
-               mp->mnt_data = (qaddr_t)0;
+               mp->mnt_data = NULL;
        }
        return error;
 }
@@ -409,7 +409,7 @@
        error = VOP_CLOSE(fcmp->fc_devvp, FREAD, NOCRED, p);
        vput(fcmp->fc_devvp);
        free((caddr_t)fcmp, M_FILECOREMNT);
-       mp->mnt_data = (qaddr_t)0;
+       mp->mnt_data = NULL;
        mp->mnt_flag &= ~MNT_LOCAL;
        return (error);
 }
diff -r df950502f0e2 -r 858d4594f5ef sys/fs/smbfs/smbfs_vfsops.c
--- a/sys/fs/smbfs/smbfs_vfsops.c       Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/fs/smbfs/smbfs_vfsops.c       Tue Jul 30 07:40:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs_vfsops.c,v 1.2 2002/01/09 17:43:29 deberg Exp $  */
+/*     $NetBSD: smbfs_vfsops.c,v 1.3 2002/07/30 07:40:08 soren Exp $   */
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -178,7 +178,7 @@
                goto bad;
         }
        bzero(smp, sizeof(*smp));
-        mp->mnt_data = (qaddr_t)smp;
+        mp->mnt_data = smp;
        smp->sm_hash = hashinit(desiredvnodes, HASH_LIST, 
                                M_SMBFSHASH, M_WAITOK, &smp->sm_hashlen);
        if (smp->sm_hash == NULL)
@@ -263,7 +263,7 @@
                return error;
        smb_makescred(&scred, p, p->p_ucred);
        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 -r df950502f0e2 -r 858d4594f5ef sys/isofs/cd9660/cd9660_vfsops.c
--- a/sys/isofs/cd9660/cd9660_vfsops.c  Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/isofs/cd9660/cd9660_vfsops.c  Tue Jul 30 07:40:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660_vfsops.c,v 1.61 2002/05/27 16:44:37 drochner Exp $      */
+/*     $NetBSD: cd9660_vfsops.c,v 1.62 2002/07/30 07:40:08 soren Exp $ */
 
 /*-
  * Copyright (c) 1994
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.61 2002/05/27 16:44:37 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.62 2002/07/30 07:40:08 soren Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -414,7 +414,7 @@
        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] = makefstype(MOUNT_CD9660);
        mp->mnt_maxsymlinklen = 0;
@@ -510,7 +510,7 @@
        }
        if (isomp) {
                free((caddr_t)isomp, M_ISOFSMNT);
-               mp->mnt_data = (qaddr_t)0;
+               mp->mnt_data = NULL;
        }
        return error;
 }
@@ -565,7 +565,7 @@
        error = VOP_CLOSE(isomp->im_devvp, FREAD, NOCRED, p);
        vput(isomp->im_devvp);
        free((caddr_t)isomp, M_ISOFSMNT);
-       mp->mnt_data = (qaddr_t)0;
+       mp->mnt_data = NULL;
        mp->mnt_flag &= ~MNT_LOCAL;
        return (error);
 }
diff -r df950502f0e2 -r 858d4594f5ef sys/miscfs/fdesc/fdesc_vfsops.c
--- a/sys/miscfs/fdesc/fdesc_vfsops.c   Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c   Tue Jul 30 07:40:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fdesc_vfsops.c,v 1.36 2001/11/15 09:48:21 lukem Exp $  */
+/*     $NetBSD: fdesc_vfsops.c,v 1.37 2002/07/30 07:40:09 soren Exp $  */
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.36 2001/11/15 09:48:21 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.37 2002/07/30 07:40:09 soren Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -111,7 +111,7 @@
        rvp->v_flag |= VROOT;
        fmp->f_root = rvp;
        mp->mnt_flag |= MNT_LOCAL;
-       mp->mnt_data = (qaddr_t)fmp;
+       mp->mnt_data = fmp;
        vfs_getnewfsid(mp);
 
        (void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
diff -r df950502f0e2 -r 858d4594f5ef sys/miscfs/kernfs/kernfs_vfsops.c
--- a/sys/miscfs/kernfs/kernfs_vfsops.c Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c Tue Jul 30 07:40:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kernfs_vfsops.c,v 1.43 2001/11/15 09:48:22 lukem Exp $ */
+/*     $NetBSD: kernfs_vfsops.c,v 1.44 2002/07/30 07:40:09 soren Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kernfs_vfsops.c,v 1.43 2001/11/15 09:48:22 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kernfs_vfsops.c,v 1.44 2002/07/30 07:40:09 soren Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -160,7 +160,7 @@
 #endif
        fmp->kf_root = rvp;
        mp->mnt_flag |= MNT_LOCAL;
-       mp->mnt_data = (qaddr_t)fmp;
+       mp->mnt_data = fmp;
        vfs_getnewfsid(mp);
 
        (void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
diff -r df950502f0e2 -r 858d4594f5ef sys/miscfs/nullfs/null_vfsops.c
--- a/sys/miscfs/nullfs/null_vfsops.c   Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/miscfs/nullfs/null_vfsops.c   Tue Jul 30 07:40:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: null_vfsops.c,v 1.36 2001/11/10 13:33:42 lukem Exp $   */
+/*     $NetBSD: null_vfsops.c,v 1.37 2002/07/30 07:40:09 soren Exp $   */
 
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.36 2001/11/10 13:33:42 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.37 2002/07/30 07:40:09 soren Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -157,7 +157,7 @@
            M_UFSMNT, M_WAITOK);                /* XXX */
        memset((caddr_t)nmp, 0, sizeof(struct null_mount));
 
-       mp->mnt_data = (qaddr_t) nmp;
+       mp->mnt_data = nmp;
        nmp->nullm_vfs = lowerrootvp->v_mount;
        if (nmp->nullm_vfs->mnt_flag & MNT_LOCAL)
                mp->mnt_flag |= MNT_LOCAL;
diff -r df950502f0e2 -r 858d4594f5ef sys/miscfs/overlay/overlay_vfsops.c
--- a/sys/miscfs/overlay/overlay_vfsops.c       Tue Jul 30 06:12:13 2002 +0000
+++ b/sys/miscfs/overlay/overlay_vfsops.c       Tue Jul 30 07:40:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: overlay_vfsops.c,v 1.10 2001/11/15 09:48:22 lukem Exp $        */
+/*     $NetBSD: overlay_vfsops.c,v 1.11 2002/07/30 07:40:10 soren Exp $        */
 
 /*
  * Copyright (c) 1999, 2000 National Aeronautics & Space Administration



Home | Main Index | Thread Index | Old Index