Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the second and third args to struct vfsops' (*vfs_mount)() to

Browse Source 
'const char *', and 'void *', respectively.  The second arg is taken directly
from user arguments, and is const there, so must be const in the prototypes
and functions.  The third arg is also taken directly from user arguments.
It doesn't have to be changed, but since it's cleaner to keep the type
the same as the user arg's type, and I'm already making the 'const char *'
change...
This commit is contained in:
cgd 1996-12-22 10:10:12 +00:00
parent 0396cad668
commit 90688fce27
20 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/adosfs/advfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: advfsops.c,v 1.23 1996/10/13 02:52:08 christos Exp $ */
/* $NetBSD: advfsops.c,v 1.24 1996/12/22 10:10:12 cgd Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -47,7 +47,7 @@
#include <adosfs/adosfs.h>
void adosfs_init __P((void));
int adosfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *,
int adosfs_mount __P((struct mount *, const char *, void *, struct nameidata *,
struct proc *));
int adosfs_start __P((struct mount *, int, struct proc *));
int adosfs_unmount __P((struct mount *, int, struct proc *));
@ -66,8 +66,8 @@ int adosfs_loadbitmap __P((struct adosfsmount *));
int
adosfs_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

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

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vfsops.c,v 1.22 1996/10/13 02:31:59 christos Exp $ */
/* $NetBSD: cd9660_vfsops.c,v 1.23 1996/12/22 10:10:15 cgd Exp $ */
/*-
* Copyright (c) 1994
@ -139,8 +139,8 @@ cd9660_mountroot()
int
cd9660_mount(mp, path, data, ndp, p)
register struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

4
sys/isofs/cd9660/iso.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: iso.h,v 1.14 1996/10/25 23:14:03 cgd Exp $ */
/* $NetBSD: iso.h,v 1.15 1996/12/22 10:10:17 cgd Exp $ */
/*-
* Copyright (c) 1994
@ -167,7 +167,7 @@ struct iso_mnt {
#define blksize(imp, ip, lbn) ((imp)->logical_block_size)
int cd9660_mount __P((struct mount *,
char *, caddr_t, struct nameidata *, struct proc *));
const char *, void *, struct nameidata *, struct proc *));
int cd9660_start __P((struct mount *, int, struct proc *));
int cd9660_unmount __P((struct mount *, int, struct proc *));
int cd9660_root __P((struct mount *, struct vnode **));

8
sys/miscfs/fdesc/fdesc_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fdesc_vfsops.c,v 1.21 1996/02/09 22:40:07 christos Exp $ */
/* $NetBSD: fdesc_vfsops.c,v 1.22 1996/12/22 10:10:19 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
@ -57,7 +57,7 @@
#include <sys/malloc.h>
#include <miscfs/fdesc/fdesc.h>
int fdesc_mount __P((struct mount *, char *, caddr_t,
int fdesc_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
int fdesc_start __P((struct mount *, int, struct proc *));
int fdesc_unmount __P((struct mount *, int, struct proc *));
@ -77,8 +77,8 @@ int fdesc_vptofh __P((struct vnode *, struct fid *));
int
fdesc_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

10
sys/miscfs/kernfs/kernfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kernfs_vfsops.c,v 1.28 1996/10/13 02:21:30 christos Exp $ */
/* $NetBSD: kernfs_vfsops.c,v 1.29 1996/12/22 10:10:21 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
@ -59,8 +59,8 @@ dev_t rrootdev = NODEV;
void kernfs_init __P((void));
void kernfs_get_rrootdev __P((void));
int kernfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *,
struct proc *));
int kernfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
int kernfs_start __P((struct mount *, int, struct proc *));
int kernfs_unmount __P((struct mount *, int, struct proc *));
int kernfs_root __P((struct mount *, struct vnode **));
@ -108,8 +108,8 @@ kernfs_get_rrootdev()
int
kernfs_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

8
sys/miscfs/nullfs/null_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: null_vfsops.c,v 1.13 1996/10/13 02:21:34 christos Exp $ */
/* $NetBSD: null_vfsops.c,v 1.14 1996/12/22 10:10:23 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
@ -55,7 +55,7 @@
#include <sys/malloc.h>
#include <miscfs/nullfs/null.h>
int nullfs_mount __P((struct mount *, char *, caddr_t,
int nullfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
int nullfs_start __P((struct mount *, int, struct proc *));
int nullfs_unmount __P((struct mount *, int, struct proc *));
@ -74,8 +74,8 @@ int nullfs_vptofh __P((struct vnode *, struct fid *));
int
nullfs_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

8
sys/miscfs/portal/portal_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: portal_vfsops.c,v 1.14 1996/02/09 22:40:41 christos Exp $ */
/* $NetBSD: portal_vfsops.c,v 1.15 1996/12/22 10:10:25 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
@ -63,7 +63,7 @@
#include <miscfs/portal/portal.h>
void portal_init __P((void));
int portal_mount __P((struct mount *, char *, caddr_t,
int portal_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
int portal_start __P((struct mount *, int, struct proc *));
int portal_unmount __P((struct mount *, int, struct proc *));
@ -88,8 +88,8 @@ portal_init()
int
portal_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

8
sys/miscfs/procfs/procfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: procfs_vfsops.c,v 1.25 1996/02/09 22:40:53 christos Exp $ */
/* $NetBSD: procfs_vfsops.c,v 1.26 1996/12/22 10:10:27 cgd Exp $ */
/*
* Copyright (c) 1993 Jan-Simon Pendry
@ -56,7 +56,7 @@
#include <miscfs/procfs/procfs.h>
#include <vm/vm.h> /* for PAGE_SIZE */
int procfs_mount __P((struct mount *, char *, caddr_t,
int procfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
int procfs_start __P((struct mount *, int, struct proc *));
int procfs_unmount __P((struct mount *, int, struct proc *));
@ -77,8 +77,8 @@ int procfs_vptofh __P((struct vnode *, struct fid *));
int
procfs_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

8
sys/miscfs/umapfs/umap_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: umap_vfsops.c,v 1.11 1996/10/13 02:21:43 christos Exp $ */
/* $NetBSD: umap_vfsops.c,v 1.12 1996/12/22 10:10:29 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
@ -54,7 +54,7 @@
#include <sys/malloc.h>
#include <miscfs/umapfs/umap.h>
int umapfs_mount __P((struct mount *, char *, caddr_t,
int umapfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
int umapfs_start __P((struct mount *, int, struct proc *));
int umapfs_unmount __P((struct mount *, int, struct proc *));
@ -74,8 +74,8 @@ int umapfs_vptofh __P((struct vnode *, struct fid *));
int
umapfs_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

8
sys/miscfs/union/union_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: union_vfsops.c,v 1.14 1996/10/13 02:21:48 christos Exp $ */
/* $NetBSD: union_vfsops.c,v 1.15 1996/12/22 10:10:30 cgd Exp $ */
/*
* Copyright (c) 1994 The Regents of the University of California.
@ -56,7 +56,7 @@
#include <sys/queue.h>
#include <miscfs/union/union.h>
int union_mount __P((struct mount *, char *, caddr_t, struct nameidata *,
int union_mount __P((struct mount *, const char *, void *, struct nameidata *,
struct proc *));
int union_start __P((struct mount *, int, struct proc *));
int union_unmount __P((struct mount *, int, struct proc *));
@ -75,8 +75,8 @@ int union_vptofh __P((struct vnode *, struct fid *));
int
union_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

10
sys/msdosfs/msdosfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: msdosfs_vfsops.c,v 1.43 1996/10/13 04:16:35 christos Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.44 1996/12/22 10:10:32 cgd Exp $ */
/*-
* Copyright (C) 1994, 1995 Wolfgang Solfrank.
@ -69,8 +69,8 @@
#include <msdosfs/msdosfsmount.h>
#include <msdosfs/fat.h>
int msdosfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *,
struct proc *));
int msdosfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
int msdosfs_start __P((struct mount *, int, struct proc *));
int msdosfs_unmount __P((struct mount *, int, struct proc *));
int msdosfs_root __P((struct mount *, struct vnode **));
@ -93,8 +93,8 @@ int msdosfs_mountfs __P((struct vnode *, struct mount *, struct proc *,
int
msdosfs_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

13
sys/nfs/nfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_vfsops.c,v 1.54 1996/12/03 00:22:48 thorpej Exp $ */
/* $NetBSD: nfs_vfsops.c,v 1.55 1996/12/22 10:10:35 cgd Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@ -101,7 +101,8 @@ extern u_int32_t nfs_procids[NFS_NPROCS];
extern u_int32_t nfs_prog, nfs_vers;
static struct mount *
nfs_mount_diskless __P((struct nfs_dlmount *, char *, int, struct vnode **));
nfs_mount_diskless __P((struct nfs_dlmount *, const char *, int,
struct vnode **));
#define TRUE 1
#define FALSE 0
@ -390,7 +391,7 @@ nfs_mountroot()
static struct mount *
nfs_mount_diskless(ndmntp, mntname, mntflag, vpp)
struct nfs_dlmount *ndmntp;
char *mntname;
const char *mntname;
int mntflag;
struct vnode **vpp;
{
@ -548,8 +549,8 @@ nfs_decode_args(nmp, argp)
int
nfs_mount(mp, path, data, ndp, p)
struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{
@ -608,7 +609,7 @@ mountnfs(argp, mp, nam, pth, hst, vpp)
register struct nfs_args *argp;
register struct mount *mp;
struct mbuf *nam;
char *pth, *hst;
const char *pth, *hst;
struct vnode **vpp;
{
register struct nfsmount *nmp;

7
sys/nfs/nfsmount.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfsmount.h,v 1.12 1996/12/03 00:22:50 thorpej Exp $ */
/* $NetBSD: nfsmount.h,v 1.13 1996/12/22 10:10:36 cgd Exp $ */
/*
* Copyright (c) 1989, 1993
@ -100,10 +100,11 @@ struct nfsmount {
/*
* Prototypes for NFS mount operations
*/
int nfs_mount __P((struct mount *mp, char *path, caddr_t data,
int nfs_mount __P((struct mount *mp, const char *path, void *data,
struct nameidata *ndp, struct proc *p));
int mountnfs __P((struct nfs_args *argp, struct mount *mp,
struct mbuf *nam, char *pth, char *hst, struct vnode **vpp));
struct mbuf *nam, const char *pth, const char *hst,
struct vnode **vpp));
int nfs_mountroot __P((void));
void nfs_decode_args __P((struct nfsmount *, struct nfs_args *));
int nfs_start __P((struct mount *mp, int flags, struct proc *p));

7
sys/sys/mount.h
View File

@ -1,5 +1,5 @@
/* $NetBSD: mount.h,v 1.49 1996/10/23 22:53:09 cgd Exp $ */
/* $NetBSD: mount.h,v 1.50 1996/12/22 10:10:38 cgd Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@ -183,8 +183,9 @@ struct mbuf;
struct vfsops {
char *vfs_name;
int (*vfs_mount) __P((struct mount *mp, char *path, caddr_t data,
struct nameidata *ndp, struct proc *p));
int (*vfs_mount) __P((struct mount *mp, const char *path,
void *data, struct nameidata *ndp,
struct proc *p));
int (*vfs_start) __P((struct mount *mp, int flags,
struct proc *p));
int (*vfs_unmount) __P((struct mount *mp, int mntflags,

4
sys/ufs/ffs/ffs_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_extern.h,v 1.5 1996/09/01 23:49:18 mycroft Exp $ */
/* $NetBSD: ffs_extern.h,v 1.6 1996/12/22 10:10:40 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -86,7 +86,7 @@ void ffs_setblock __P((struct fs *, unsigned char *, daddr_t));
/* ffs_vfsops.c */
int ffs_mountroot __P((void));
int ffs_mount __P((struct mount *, char *, caddr_t, struct nameidata *,
int ffs_mount __P((struct mount *, const char *, void *, struct nameidata *,
struct proc *));
int ffs_reload __P((struct mount *, struct ucred *, struct proc *));
int ffs_mountfs __P((struct vnode *, struct mount *, struct proc *));

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

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vfsops.c,v 1.21 1996/10/12 21:58:47 christos Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.22 1996/12/22 10:10:41 cgd Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@ -141,8 +141,8 @@ ffs_mountroot()
int
ffs_mount(mp, path, data, ndp, p)
register struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

4
sys/ufs/lfs/lfs_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_extern.h,v 1.5 1996/02/12 15:20:12 christos Exp $ */
/* $NetBSD: lfs_extern.h,v 1.6 1996/12/22 10:10:42 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -110,7 +110,7 @@ struct buf *lfs_fakebuf __P((struct vnode *, int, size_t, caddr_t));
/* lfs_vfsops.c */
int lfs_mountroot __P((void));
int lfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, struct proc *));
int lfs_mount __P((struct mount *, const char *, void *, struct nameidata *, struct proc *));
int lfs_mountfs __P((struct vnode *, struct mount *, struct proc *));
int lfs_unmount __P((struct mount *, int, struct proc *));
int lfs_statfs __P((struct mount *, struct statfs *, struct proc *));

6
sys/ufs/lfs/lfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vfsops.c,v 1.11 1996/03/25 12:53:35 pk Exp $ */
/* $NetBSD: lfs_vfsops.c,v 1.12 1996/12/22 10:10:43 cgd Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@ -93,8 +93,8 @@ lfs_mountroot()
int
lfs_mount(mp, path, data, ndp, p)
register struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{

4
sys/ufs/mfs/mfs_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfs_extern.h,v 1.5 1996/09/01 23:49:34 mycroft Exp $ */
/* $NetBSD: mfs_extern.h,v 1.6 1996/12/22 10:10:44 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -47,7 +47,7 @@ __BEGIN_DECLS
/* mfs_vfsops.c */
int mfs_mountroot __P((void));
int mfs_initminiroot __P((caddr_t));
int mfs_mount __P((struct mount *, char *, caddr_t,
int mfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
int mfs_start __P((struct mount *, int, struct proc *));
int mfs_statfs __P((struct mount *, struct statfs *, struct proc *));

6
sys/ufs/mfs/mfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $ */
/* $NetBSD: mfs_vfsops.c,v 1.11 1996/12/22 10:10:45 cgd Exp $ */
/*
* Copyright (c) 1989, 1990, 1993, 1994
@ -178,8 +178,8 @@ mfs_initminiroot(base)
int
mfs_mount(mp, path, data, ndp, p)
register struct mount *mp;
char *path;
caddr_t data;
const char *path;
void *data;
struct nameidata *ndp;
struct proc *p;
{