From 86744021bc298d5866b29e263475344195783db9 Mon Sep 17 00:00:00 2001
From: assar <assar@cvs.openbsd.org>
Date: Tue, 20 Feb 2001 01:50:13 +0000
Subject: use void * consistently in vfs_mount and sys_mount.  ok @art

---
 sys/miscfs/fdesc/fdesc_vfsops.c   | 6 +++---
 sys/miscfs/kernfs/kernfs_vfsops.c | 6 +++---
 sys/miscfs/nullfs/null_vfsops.c   | 8 ++++----
 sys/miscfs/portal/portal_vfsops.c | 8 ++++----
 sys/miscfs/procfs/procfs_vfsops.c | 6 +++---
 sys/miscfs/tcfs/tcfs_vfsops.c     | 8 ++++----
 sys/miscfs/umapfs/umap_vfsops.c   | 8 ++++----
 sys/miscfs/union/union_vfsops.c   | 8 ++++----
 8 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'sys/miscfs')

diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index a919fe2cb4a..d4079efa31a 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdesc_vfsops.c,v 1.8 2000/02/07 04:57:16 assar Exp $	*/
+/*	$OpenBSD: fdesc_vfsops.c,v 1.9 2001/02/20 01:50:09 assar Exp $	*/
 /*	$NetBSD: fdesc_vfsops.c,v 1.21 1996/02/09 22:40:07 christos Exp $	*/
 
 /*
@@ -58,7 +58,7 @@
 #include <sys/malloc.h>
 #include <miscfs/fdesc/fdesc.h>
 
-int	fdesc_mount __P((struct mount *, const 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 *));
@@ -78,7 +78,7 @@ int
 fdesc_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	const char *path;
-	caddr_t data;
+	void *data;
 	struct nameidata *ndp;
 	struct proc *p;
 {
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 6693d43f09b..96713bbc6f1 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kernfs_vfsops.c,v 1.13 2000/02/07 04:57:16 assar Exp $	*/
+/*	$OpenBSD: kernfs_vfsops.c,v 1.14 2001/02/20 01:50:09 assar Exp $	*/
 /*	$NetBSD: kernfs_vfsops.c,v 1.26 1996/04/22 01:42:27 christos Exp $	*/
 
 /*
@@ -67,7 +67,7 @@ dev_t rrootdev = NODEV;
 
 int kernfs_init __P((struct vfsconf *));
 void	kernfs_get_rrootdev __P((void));
-int	kernfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *,
+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 *));
@@ -112,7 +112,7 @@ int
 kernfs_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	const char *path;
-	caddr_t data;
+	void *data;
 	struct nameidata *ndp;
 	struct proc *p;
 {
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 4c51b51a4b0..71f192b0be8 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: null_vfsops.c,v 1.11 2000/02/07 04:57:16 assar Exp $	*/
+/*	$OpenBSD: null_vfsops.c,v 1.12 2001/02/20 01:50:10 assar Exp $	*/
 /*	$NetBSD: null_vfsops.c,v 1.11 1996/05/10 22:50:56 jtk Exp $	*/
 
 /*
@@ -57,7 +57,7 @@
 #include <sys/malloc.h>
 #include <miscfs/nullfs/null.h>
 
-int	nullfs_mount __P((struct mount *, const 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 *));
@@ -76,7 +76,7 @@ int
 nullfs_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	const char *path;
-	caddr_t data;
+	void *data;
 	struct nameidata *ndp;
 	struct proc *p;
 {
@@ -102,7 +102,7 @@ nullfs_mount(mp, path, data, ndp, p)
 	/*
 	 * Get argument
 	 */
-	error = copyin(data, (caddr_t)&args, sizeof(struct null_args));
+	error = copyin(data, &args, sizeof(struct null_args));
 	if (error)
 		return (error);
 
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 2211aa0e903..a5beda20981 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portal_vfsops.c,v 1.8 2000/02/07 04:57:16 assar Exp $	*/
+/*	$OpenBSD: portal_vfsops.c,v 1.9 2001/02/20 01:50:10 assar Exp $	*/
 /*	$NetBSD: portal_vfsops.c,v 1.14 1996/02/09 22:40:41 christos Exp $	*/
 
 /*
@@ -65,7 +65,7 @@
 
 #define portal_init ((int (*) __P((struct vfsconf *)))nullop)
 
-int	portal_mount __P((struct mount *, const 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 *));
@@ -80,7 +80,7 @@ int
 portal_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	const char *path;
-	caddr_t data;
+	void *data;
 	struct nameidata *ndp;
 	struct proc *p;
 {
@@ -98,7 +98,7 @@ portal_mount(mp, path, data, ndp, p)
 	if (mp->mnt_flag & MNT_UPDATE)
 		return (EOPNOTSUPP);
 
-	error = copyin(data, (caddr_t) &args, sizeof(struct portal_args));
+	error = copyin(data, &args, sizeof(struct portal_args));
 	if (error)
 		return (error);
 
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 5e997b87abf..287138795e0 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_vfsops.c,v 1.11 2000/02/07 04:57:16 assar Exp $	*/
+/*	$OpenBSD: procfs_vfsops.c,v 1.12 2001/02/20 01:50:10 assar Exp $	*/
 /*	$NetBSD: procfs_vfsops.c,v 1.25 1996/02/09 22:40:53 christos Exp $	*/
 
 /*
@@ -61,7 +61,7 @@
 #include <uvm/uvm_extern.h>
 #endif
 
-int	procfs_mount __P((struct mount *, const 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 *));
@@ -76,7 +76,7 @@ int
 procfs_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	const char *path;
-	caddr_t data;
+	void *data;
 	struct nameidata *ndp;
 	struct proc *p;
 {
diff --git a/sys/miscfs/tcfs/tcfs_vfsops.c b/sys/miscfs/tcfs/tcfs_vfsops.c
index ecedf4cd3c3..525f0bc6a5e 100644
--- a/sys/miscfs/tcfs/tcfs_vfsops.c
+++ b/sys/miscfs/tcfs/tcfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcfs_vfsops.c,v 1.3 2000/06/17 20:25:55 provos Exp $	*/
+/*	$OpenBSD: tcfs_vfsops.c,v 1.4 2001/02/20 01:50:10 assar Exp $	*/
 /*
  * Copyright 2000 The TCFS Project at http://tcfs.dia.unisa.it/
  * All rights reserved.
@@ -36,7 +36,7 @@
 #include <sys/malloc.h>
 #include <miscfs/tcfs/tcfs.h>
 
-int	tcfs_mount __P((struct mount *, const char *, caddr_t,
+int	tcfs_mount __P((struct mount *, const char *, void *,
 			  struct nameidata *, struct proc *));
 int	tcfs_start __P((struct mount *, int, struct proc *));
 int	tcfs_unmount __P((struct mount *, int, struct proc *));
@@ -54,7 +54,7 @@ int
 tcfs_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	const char *path;
-	caddr_t data;
+	void *data;
 	struct nameidata *ndp;
 	struct proc *p;
 {
@@ -73,7 +73,7 @@ tcfs_mount(mp, path, data, ndp, p)
 	/*
 	 * Get argument
 	 */
-	error = copyin(data, (caddr_t)&args, sizeof(struct tcfs_args));
+	error = copyin(data, &args, sizeof(struct tcfs_args));
 	if (error)
 		return (error);
 
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index bcbeed4a249..fc22f8020b7 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umap_vfsops.c,v 1.15 2000/02/07 04:57:17 assar Exp $	*/
+/*	$OpenBSD: umap_vfsops.c,v 1.16 2001/02/20 01:50:10 assar Exp $	*/
 /*	$NetBSD: umap_vfsops.c,v 1.9 1996/02/09 22:41:05 christos Exp $	*/
 
 /*
@@ -56,7 +56,7 @@
 #include <sys/malloc.h>
 #include <miscfs/umapfs/umap.h>
 
-int	umapfs_mount __P((struct mount *, const 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 *));
@@ -76,7 +76,7 @@ int
 umapfs_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	const char *path;
-	caddr_t data;
+	void *data;
 	struct nameidata *ndp;
 	struct proc *p;
 {
@@ -109,7 +109,7 @@ umapfs_mount(mp, path, data, ndp, p)
 	/*
 	 * Get argument
 	 */
-	error = copyin(data, (caddr_t)&args, sizeof(struct umap_args));
+	error = copyin(data, &args, sizeof(struct umap_args));
 	if (error)
 		return (error);
 
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index fd155de5eb7..595abfa24dc 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: union_vfsops.c,v 1.10 2000/02/07 04:57:17 assar Exp $	*/
+/*	$OpenBSD: union_vfsops.c,v 1.11 2001/02/20 01:50:11 assar Exp $	*/
 /*	$NetBSD: union_vfsops.c,v 1.10 1995/06/18 14:47:47 cgd Exp $	*/
 
 /*
@@ -59,7 +59,7 @@
 
 #include <miscfs/union/union.h>
 
-int union_mount __P((struct mount *, const 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 *));
@@ -73,7 +73,7 @@ int
 union_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	const char *path;
-	caddr_t data;
+	void *data;
 	struct nameidata *ndp;
 	struct proc *p;
 {
@@ -107,7 +107,7 @@ union_mount(mp, path, data, ndp, p)
 	/*
 	 * Get argument
 	 */
-	error = copyin(data, (caddr_t)&args, sizeof(struct union_args));
+	error = copyin(data, &args, sizeof(struct union_args));
 	if (error)
 		goto bad;
 
-- 
cgit v1.2.3