Date: 21 Feb 2001 03:55:37 +0100 From: assar@freebsd.org To: audit@freebsd.org Subject: changing type of vfs_mount Message-ID: <5lsnl87niu.fsf@assaris.sics.se>
next in thread | raw e-mail | index | archive | help
--=-=-=
Here are some patches that change the type of vfs_mount and the mount
syscall to use the more correct `const char *path, void *data' which
also brings FreeBSD in line with the other BSDs. Comments?
/assar
--=-=-=
Content-Disposition: attachment; filename=fbsd-sys.diff
Index: coda/coda_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/coda/coda_vfsops.c,v
retrieving revision 1.29
diff -u -w -r1.29 coda_vfsops.c
--- coda/coda_vfsops.c 2001/01/27 00:01:26 1.29
+++ coda/coda_vfsops.c 2001/02/21 02:50:30
@@ -107,8 +107,8 @@
int
coda_mount(vfsp, path, data, ndp, p)
struct mount *vfsp; /* Allocated and initialized by mount(2) */
- char *path; /* path covered: ignored by the fs-layer */
- caddr_t data; /* Need to define a data type for this in netbsd? */
+ const char *path; /* path covered: ignored by the fs-layer */
+ void *data; /* Need to define a data type for this in netbsd? */
struct nameidata *ndp; /* Clobber this to lookup the device name */
struct proc *p; /* The ever-famous proc pointer */
{
Index: coda/coda_vfsops.h
===================================================================
RCS file: /home/ncvs/src/sys/coda/coda_vfsops.h,v
retrieving revision 1.5
diff -u -w -r1.5 coda_vfsops.h
--- coda/coda_vfsops.h 2000/10/05 11:58:22 1.5
+++ coda/coda_vfsops.h 2001/02/21 02:50:30
@@ -47,7 +47,7 @@
struct mount;
int coda_vfsopstats_init(void);
-int coda_mount(struct mount *, char *, caddr_t, struct nameidata *,
+int coda_mount(struct mount *, const char *, void *, struct nameidata *,
struct proc *);
int coda_start(struct mount *, int, struct proc *);
int coda_unmount(struct mount *, int, struct proc *);
Index: compat/linprocfs/linprocfs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/compat/linprocfs/linprocfs_vfsops.c,v
retrieving revision 1.6
diff -u -w -r1.6 linprocfs_vfsops.c
--- compat/linprocfs/linprocfs_vfsops.c 2000/12/13 20:19:06 1.6
+++ compat/linprocfs/linprocfs_vfsops.c 2001/02/21 02:50:35
@@ -54,7 +54,8 @@
#include <sys/vnode.h>
#include <compat/linprocfs/linprocfs.h>
-static int linprocfs_mount __P((struct mount *mp, char *path, caddr_t data,
+static int linprocfs_mount __P((struct mount *mp, const char *path,
+ void *data,
struct nameidata *ndp, struct proc *p));
static int linprocfs_statfs __P((struct mount *mp, struct statfs *sbp,
struct proc *p));
@@ -70,8 +71,8 @@
static int
linprocfs_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;
{
Index: fs/devfs/devfs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/fs/devfs/devfs_vfsops.c,v
retrieving revision 1.11
diff -u -w -r1.11 devfs_vfsops.c
--- fs/devfs/devfs_vfsops.c 2000/12/08 21:50:04 1.11
+++ fs/devfs/devfs_vfsops.c 2001/02/21 02:50:44
@@ -47,7 +47,8 @@
MALLOC_DEFINE(M_DEVFS, "DEVFS", "DEVFS data");
-static int devfs_mount __P((struct mount *mp, char *path, caddr_t data,
+static int devfs_mount __P((struct mount *mp, const char *path,
+ void *data,
struct nameidata *ndp, struct proc *p));
static int devfs_unmount __P((struct mount *mp, int mntflags,
struct proc *p));
@@ -61,8 +62,8 @@
static int
devfs_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;
{
Index: fs/hpfs/hpfs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/fs/hpfs/hpfs_vfsops.c,v
retrieving revision 1.10
diff -u -w -r1.10 hpfs_vfsops.c
--- fs/hpfs/hpfs_vfsops.c 2001/01/27 00:01:29 1.10
+++ fs/hpfs/hpfs_vfsops.c 2001/02/21 02:50:44
@@ -84,7 +84,7 @@
#if defined(__FreeBSD__)
struct sockaddr;
-static int hpfs_mount __P((struct mount *, char *, caddr_t,
+static int hpfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
static int hpfs_init __P((struct vfsconf *));
static int hpfs_uninit __P((struct vfsconf *));
Index: gnu/ext2fs/ext2_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/gnu/ext2fs/ext2_vfsops.c,v
retrieving revision 1.76
diff -u -w -r1.76 ext2_vfsops.c
--- gnu/ext2fs/ext2_vfsops.c 2001/02/09 06:09:16 1.76
+++ gnu/ext2fs/ext2_vfsops.c 2001/02/21 02:50:45
@@ -73,7 +73,7 @@
static int ext2_fhtovp __P((struct mount *, struct fid *, struct vnode **));
static int ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
static int ext2_mount __P((struct mount *,
- char *, caddr_t, struct nameidata *, struct proc *));
+ const char *, void *, struct nameidata *, struct proc *));
static int ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
struct proc *p));
@@ -179,8 +179,8 @@
static int
ext2_mount(mp, path, data, ndp, p)
register struct mount *mp;
- char *path;
- caddr_t data; /* this is actually a (struct ufs_args *) */
+ const char *path;
+ void *data; /* this is actually a (struct ufs_args *) */
struct nameidata *ndp;
struct proc *p;
{
Index: isofs/cd9660/cd9660_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/isofs/cd9660/cd9660_vfsops.c,v
retrieving revision 1.83
diff -u -w -r1.83 cd9660_vfsops.c
--- isofs/cd9660/cd9660_vfsops.c 2001/01/27 00:01:31 1.83
+++ isofs/cd9660/cd9660_vfsops.c 2001/02/21 02:50:49
@@ -65,7 +65,7 @@
MALLOC_DEFINE(M_ISOFSNODE, "ISOFS node", "ISOFS vnode private part");
static int cd9660_mount __P((struct mount *,
- char *, caddr_t, struct nameidata *, struct proc *));
+ const char *, void *, struct nameidata *, struct proc *));
static int cd9660_unmount __P((struct mount *, int, struct proc *));
static int cd9660_root __P((struct mount *, struct vnode **));
static int cd9660_statfs __P((struct mount *, struct statfs *, struct proc *));
@@ -176,8 +176,8 @@
static 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;
{
Index: kern/syscalls.master
===================================================================
RCS file: /home/ncvs/src/sys/kern/syscalls.master,v
retrieving revision 1.84
diff -u -w -r1.84 syscalls.master
--- kern/syscalls.master 2000/12/02 05:41:29 1.84
+++ kern/syscalls.master 2001/02/21 02:50:51
@@ -66,8 +66,8 @@
int flags); }
19 COMPAT POSIX { long lseek(int fd, long offset, int whence); }
20 STD POSIX { pid_t getpid(void); }
-21 STD BSD { int mount(char *type, char *path, int flags, \
- caddr_t data); }
+21 STD BSD { int mount(const char *type, const char *path, \
+ int flags, void *data); }
; XXX 4.4lite2 uses `char *type' but we're not ready for that.
; XXX `path' should have type `const char *' but we're not ready for that.
22 STD BSD { int unmount(char *path, int flags); }
Index: kern/vfs_default.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/vfs_default.c,v
retrieving revision 1.41
diff -u -w -r1.41 vfs_default.c
--- kern/vfs_default.c 2001/02/18 02:22:58 1.41
+++ kern/vfs_default.c 2001/02/21 02:50:53
@@ -624,8 +624,8 @@
int
vfs_stdmount (mp, path, data, ndp, p)
struct mount *mp;
- char *path;
- caddr_t data;
+ const char *path;
+ void *data;
struct nameidata *ndp;
struct proc *p;
{
Index: kern/vfs_syscalls.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/vfs_syscalls.c,v
retrieving revision 1.177
diff -u -w -r1.177 vfs_syscalls.c
--- kern/vfs_syscalls.c 2001/02/16 14:31:49 1.177
+++ kern/vfs_syscalls.c 2001/02/21 02:50:54
@@ -97,10 +97,10 @@
*/
#ifndef _SYS_SYSPROTO_H_
struct mount_args {
- char *type;
- char *path;
+ const char *type;
+ const char *path;
int flags;
- caddr_t data;
+ void *data;
};
#endif
/* ARGSUSED */
@@ -116,10 +116,10 @@
mount1(p, uap, segflag)
struct proc *p;
struct mount_args /* {
- syscallarg(char *) type;
- syscallarg(char *) path;
+ syscallarg(const char *) type;
+ syscallarg(const char *) path;
syscallarg(int) flags;
- syscallarg(caddr_t) data;
+ syscallarg(void *) data;
} */ *uap;
int segflag;
{
Index: miscfs/fdesc/fdesc_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/miscfs/fdesc/fdesc_vfsops.c,v
retrieving revision 1.23
diff -u -w -r1.23 fdesc_vfsops.c
--- miscfs/fdesc/fdesc_vfsops.c 2000/10/09 20:06:13 1.23
+++ miscfs/fdesc/fdesc_vfsops.c 2001/02/21 02:50:55
@@ -55,7 +55,8 @@
static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure");
-static int fdesc_mount __P((struct mount *mp, char *path, caddr_t data,
+static int fdesc_mount __P((struct mount *mp, const char *path,
+ void *data,
struct nameidata *ndp, struct proc *p));
static int fdesc_unmount __P((struct mount *mp, int mntflags,
struct proc *p));
@@ -68,8 +69,8 @@
static 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;
{
Index: miscfs/nullfs/null_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/miscfs/nullfs/null_vfsops.c,v
retrieving revision 1.43
diff -u -w -r1.43 null_vfsops.c
--- miscfs/nullfs/null_vfsops.c 2000/10/29 13:56:56 1.43
+++ miscfs/nullfs/null_vfsops.c 2001/02/21 02:50:55
@@ -59,7 +59,7 @@
struct vnode **vpp);
static int nullfs_checkexp(struct mount *mp, struct sockaddr *nam,
int *extflagsp, struct ucred **credanonp);
-static int nullfs_mount(struct mount *mp, char *path, caddr_t data,
+static int nullfs_mount(struct mount *mp, const char *path, void *data,
struct nameidata *ndp, struct proc *p);
static int nullfs_quotactl(struct mount *mp, int cmd, uid_t uid,
caddr_t arg, struct proc *p);
@@ -81,8 +81,8 @@
static 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;
{
Index: miscfs/portal/portal_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/miscfs/portal/portal_vfsops.c,v
retrieving revision 1.27
diff -u -w -r1.27 portal_vfsops.c
--- miscfs/portal/portal_vfsops.c 2000/11/25 07:16:06 1.27
+++ miscfs/portal/portal_vfsops.c 2001/02/21 02:50:55
@@ -59,7 +59,8 @@
static MALLOC_DEFINE(M_PORTALFSMNT, "PORTAL mount", "PORTAL mount structure");
-static int portal_mount __P((struct mount *mp, char *path, caddr_t data,
+static int portal_mount __P((struct mount *mp, const char *path,
+ void *data,
struct nameidata *ndp, struct proc *p));
static int portal_unmount __P((struct mount *mp, int mntflags,
struct proc *p));
@@ -73,8 +74,8 @@
static 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;
{
Index: miscfs/umapfs/umap_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/miscfs/umapfs/umap_vfsops.c,v
retrieving revision 1.33
diff -u -w -r1.33 umap_vfsops.c
--- miscfs/umapfs/umap_vfsops.c 2000/10/29 16:06:36 1.33
+++ miscfs/umapfs/umap_vfsops.c 2001/02/21 02:50:55
@@ -58,7 +58,8 @@
struct vnode **vpp));
static int umapfs_checkexp __P((struct mount *mp, struct sockaddr *nam,
int *extflagsp, struct ucred **credanonp));
-static int umapfs_mount __P((struct mount *mp, char *path, caddr_t data,
+static int umapfs_mount __P((struct mount *mp, const char *path,
+ void *data,
struct nameidata *ndp, struct proc *p));
static int umapfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
caddr_t arg, struct proc *p));
@@ -83,8 +84,8 @@
static 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;
{
Index: miscfs/union/union_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/miscfs/union/union_vfsops.c,v
retrieving revision 1.42
diff -u -w -r1.42 union_vfsops.c
--- miscfs/union/union_vfsops.c 2001/02/04 13:12:34 1.42
+++ miscfs/union/union_vfsops.c 2001/02/21 02:51:00
@@ -56,7 +56,8 @@
static MALLOC_DEFINE(M_UNIONFSMNT, "UNION mount", "UNION mount structure");
extern int union_init __P((struct vfsconf *));
-static int union_mount __P((struct mount *mp, char *path, caddr_t data,
+static int union_mount __P((struct mount *mp, const char *path,
+ void *data,
struct nameidata *ndp, struct proc *p));
static int union_root __P((struct mount *mp, struct vnode **vpp));
static int union_statfs __P((struct mount *mp, struct statfs *sbp,
@@ -70,8 +71,8 @@
static 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;
{
Index: msdosfs/msdosfs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/msdosfs/msdosfs_vfsops.c,v
retrieving revision 1.71
diff -u -w -r1.71 msdosfs_vfsops.c
--- msdosfs/msdosfs_vfsops.c 2001/02/09 06:10:54 1.71
+++ msdosfs/msdosfs_vfsops.c 2001/02/21 02:51:09
@@ -93,7 +93,7 @@
struct vnode **));
static int msdosfs_checkexp __P((struct mount *, struct sockaddr *,
int *, struct ucred **));
-static int msdosfs_mount __P((struct mount *, char *, caddr_t,
+static int msdosfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
static int msdosfs_root __P((struct mount *, struct vnode **));
static int msdosfs_statfs __P((struct mount *, struct statfs *,
@@ -224,8 +224,8 @@
static 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;
{
Index: nfs/nfs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/nfs/nfs_vfsops.c,v
retrieving revision 1.93
diff -u -w -r1.93 nfs_vfsops.c
--- nfs/nfs_vfsops.c 2000/11/14 08:00:39 1.93
+++ nfs/nfs_vfsops.c 2001/02/21 02:51:12
@@ -99,7 +99,8 @@
struct nfs_args *argp));
static int mountnfs __P((struct nfs_args *,struct mount *,
struct sockaddr *,char *,char *,struct vnode **));
-static int nfs_mount __P(( struct mount *mp, char *path, caddr_t data,
+static int nfs_mount __P(( struct mount *mp, const char *path,
+ void *data,
struct nameidata *ndp, struct proc *p));
static int nfs_unmount __P(( struct mount *mp, int mntflags,
struct proc *p));
@@ -755,8 +756,8 @@
static 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;
{
Index: ntfs/ntfs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/ntfs/ntfs_vfsops.c,v
retrieving revision 1.27
diff -u -w -r1.27 ntfs_vfsops.c
--- ntfs/ntfs_vfsops.c 2001/02/09 06:11:07 1.27
+++ ntfs/ntfs_vfsops.c 2001/02/21 02:51:13
@@ -96,7 +96,7 @@
#if defined(__FreeBSD__)
struct sockaddr;
-static int ntfs_mount __P((struct mount *, char *, caddr_t,
+static int ntfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
static int ntfs_init __P((struct vfsconf *));
static int ntfs_checkexp __P((struct mount *, struct sockaddr *,
@@ -236,13 +236,8 @@
static int
ntfs_mount (
struct mount *mp,
-#if defined(__FreeBSD__)
- char *path,
- caddr_t data,
-#else
const char *path,
void *data,
-#endif
struct nameidata *ndp,
struct proc *p )
{
Index: nwfs/nwfs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/nwfs/nwfs_vfsops.c,v
retrieving revision 1.12
diff -u -w -r1.12 nwfs_vfsops.c
--- nwfs/nwfs_vfsops.c 2001/02/04 13:13:15 1.12
+++ nwfs/nwfs_vfsops.c 2001/02/21 02:51:13
@@ -69,7 +69,7 @@
MODULE_DEPEND(nwfs, ncp, 1, 1, 1);
-static int nwfs_mount(struct mount *, char *, caddr_t,
+static int nwfs_mount(struct mount *, const char *, void *,
struct nameidata *, struct proc *);
static int nwfs_quotactl(struct mount *, int, uid_t, caddr_t, struct proc *);
static int nwfs_root(struct mount *, struct vnode **);
@@ -142,7 +142,7 @@
* mp - path - addr in user space of mount point (ie /usr or whatever)
* data - addr in user space of mount params
*/
-static int nwfs_mount(struct mount *mp, char *path, caddr_t data,
+static int nwfs_mount(struct mount *mp, const char *path, void *data,
struct nameidata *ndp, struct proc *p)
{
struct nwfs_args args; /* will hold data from mount request */
Index: sys/mount.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/mount.h,v
retrieving revision 1.101
diff -u -w -r1.101 mount.h
--- sys/mount.h 2001/02/18 13:30:19 1.101
+++ sys/mount.h 2001/02/21 02:51:14
@@ -316,8 +316,9 @@
#endif
struct vfsops {
- 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,
@@ -435,7 +436,7 @@
* kern/vfs_default.c, they should be used instead of making "dummy"
* functions or casting entries in the VFS op table to "enopnotsupp()".
*/
-int vfs_stdmount __P((struct mount *mp, char *path, caddr_t data,
+int vfs_stdmount __P((struct mount *mp, const char *path, void *data,
struct nameidata *ndp, struct proc *p));
int vfs_stdstart __P((struct mount *mp, int flags, struct proc *p));
int vfs_stdunmount __P((struct mount *mp, int mntflags, struct proc *p));
Index: sys/sysproto.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/sysproto.h,v
retrieving revision 1.71
diff -u -w -r1.71 sysproto.h
--- sys/sysproto.h 2000/12/02 05:45:32 1.71
+++ sys/sysproto.h 2001/02/21 02:51:16
@@ -2,7 +2,7 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/sysproto.h,v 1.71 2000/12/02 05:45:32 jake Exp $
+ * $FreeBSD$
* created from FreeBSD: src/sys/kern/syscalls.master,v 1.84 2000/12/02 05:41:29 jake Exp
*/
@@ -90,10 +90,10 @@
register_t dummy;
};
struct mount_args {
- char * type; char type_[PAD_(char *)];
- char * path; char path_[PAD_(char *)];
+ const char * type; char type_[PAD_(const char *)];
+ const char * path; char path_[PAD_(const char *)];
int flags; char flags_[PAD_(int)];
- caddr_t data; char data_[PAD_(caddr_t)];
+ void * data; char data_[PAD_(void *)];
};
struct unmount_args {
char * path; char path_[PAD_(char *)];
Index: ufs/ffs/ffs_extern.h
===================================================================
RCS file: /home/ncvs/src/sys/ufs/ffs/ffs_extern.h,v
retrieving revision 1.36
diff -u -w -r1.36 ffs_extern.h
--- ufs/ffs/ffs_extern.h 2000/12/19 04:41:02 1.36
+++ ufs/ffs/ffs_extern.h 2001/02/21 02:51:16
@@ -87,8 +87,8 @@
int ffs_mountfs __P((struct vnode *, struct mount *, struct proc *,
struct malloc_type *));
int ffs_mountroot __P((void));
-int ffs_mount __P((struct mount *, char *, caddr_t, struct nameidata *,
- struct proc *));
+int ffs_mount __P((struct mount *, const char *, void *,
+ struct nameidata *, struct proc *));
int ffs_reallocblks __P((struct vop_reallocblks_args *));
int ffs_realloccg __P((struct inode *,
ufs_daddr_t, ufs_daddr_t, int, int, struct ucred *, struct buf **));
Index: ufs/ffs/ffs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/ufs/ffs/ffs_vfsops.c,v
retrieving revision 1.138
diff -u -w -r1.138 ffs_vfsops.c
--- ufs/ffs/ffs_vfsops.c 2001/02/09 06:11:33 1.138
+++ ufs/ffs/ffs_vfsops.c 2001/02/21 02:51:17
@@ -134,8 +134,8 @@
int
ffs_mount(mp, path, data, ndp, p)
struct mount *mp; /* mount struct pointer*/
- char *path; /* path to mount point*/
- caddr_t data; /* arguments to FS specific mount*/
+ const char *path; /* path to mount point*/
+ void *data; /* arguments to FS specific mount*/
struct nameidata *ndp; /* mount point credentials*/
struct proc *p; /* process requesting mount*/
{
Index: ufs/ifs/ifs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/ufs/ifs/ifs_vfsops.c,v
retrieving revision 1.5
diff -u -w -r1.5 ifs_vfsops.c
--- ufs/ifs/ifs_vfsops.c 2001/02/09 06:11:37 1.5
+++ ufs/ifs/ifs_vfsops.c 2001/02/21 02:51:17
@@ -69,7 +69,7 @@
static MALLOC_DEFINE(M_IFSNODE, "IFS node", "IFS vnode private part");
static int ifs_init (struct vfsconf *);
-static int ifs_mount (struct mount *, char *, caddr_t,
+static int ifs_mount (struct mount *, const char *, void *,
struct nameidata *, struct proc *);
extern int ifs_vget (struct mount *, ino_t, struct vnode **);
@@ -103,8 +103,8 @@
static int
ifs_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;
{
Index: ufs/mfs/mfs_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/ufs/mfs/mfs_vfsops.c,v
retrieving revision 1.86
diff -u -w -r1.86 mfs_vfsops.c
--- ufs/mfs/mfs_vfsops.c 2000/08/20 21:34:39 1.86
+++ ufs/mfs/mfs_vfsops.c 2001/02/21 02:51:17
@@ -70,7 +70,7 @@
extern vop_t **mfs_vnodeop_p;
static int mfs_mount __P((struct mount *mp,
- char *path, caddr_t data, struct nameidata *ndp,
+ const char *path, void *data, struct nameidata *ndp,
struct proc *p));
static int mfs_start __P((struct mount *mp, int flags, struct proc *p));
static int mfs_statfs __P((struct mount *mp, struct statfs *sbp,
@@ -158,8 +158,8 @@
static 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;
{
--=-=-=--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-audit" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5lsnl87niu.fsf>