summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjrf <jrf@NetBSD.org>2004-04-27 17:37:30 +0000
committerjrf <jrf@NetBSD.org>2004-04-27 17:37:30 +0000
commitfc97fd571a8b001fa0dae33a1129a06147cd62bb (patch)
tree05ebecf004fe0ab63f13409332952f9e3a41a04d
parentd1e0d393caec043454c7c1e83290754ff41987bb (diff)
First pass for some caddr_t removal and changes to get rid of it where we
no longer use and/or need it - removed casts from unionfs, deadfs and fdesc (there are more to hunt down still) - changed vfs_quotactl args argumet from caddr_t to void * - changed vfs_quotactl structures/callers to reflect the api change Compiled fine and ran for about a day. Approved/reviewed by christos@netbsd.org and gimpy@netbsd.org.
-rw-r--r--sys/coda/coda_vfsops.c6
-rw-r--r--sys/coda/coda_vfsops.h4
-rw-r--r--sys/fs/adosfs/advfsops.c8
-rw-r--r--sys/fs/cd9660/cd9660_extern.h4
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c6
-rw-r--r--sys/fs/filecorefs/filecore_extern.h4
-rw-r--r--sys/fs/filecorefs/filecore_vfsops.c6
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c8
-rw-r--r--sys/fs/ntfs/ntfs_vfsops.c8
-rw-r--r--sys/fs/smbfs/smbfs_vfsops.c8
-rw-r--r--sys/fs/union/union_subr.c8
-rw-r--r--sys/fs/union/union_vfsops.c8
-rw-r--r--sys/fs/union/union_vnops.c12
-rw-r--r--sys/miscfs/deadfs/dead_vnops.c6
-rw-r--r--sys/miscfs/fdesc/fdesc_vfsops.c8
-rw-r--r--sys/miscfs/fdesc/fdesc_vnops.c14
-rw-r--r--sys/miscfs/genfs/layer_extern.h4
-rw-r--r--sys/miscfs/genfs/layer_vfsops.c6
-rw-r--r--sys/miscfs/kernfs/kernfs_vfsops.c8
-rw-r--r--sys/miscfs/portal/portal_vfsops.c8
-rw-r--r--sys/miscfs/procfs/procfs_vfsops.c8
-rw-r--r--sys/nfs/nfs_vfsops.c6
-rw-r--r--sys/nfs/nfsmount.h4
-rw-r--r--sys/sys/mount.h4
-rw-r--r--sys/ufs/ufs/quota.h4
-rw-r--r--sys/ufs/ufs/ufs_extern.h4
-rw-r--r--sys/ufs/ufs/ufs_vfsops.c6
27 files changed, 90 insertions, 90 deletions
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index 64cd6cc88b4..ad828d52259 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vfsops.c,v 1.35 2004/04/21 02:41:52 christos Exp $ */
+/* $NetBSD: coda_vfsops.c,v 1.36 2004/04/27 17:37:30 jrf Exp $ */
/*
*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.35 2004/04/21 02:41:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.36 2004/04/27 17:37:30 jrf Exp $");
#ifdef _LKM
#define NVCODA 4
@@ -410,7 +410,7 @@ coda_quotactl(vfsp, cmd, uid, arg, p)
struct mount *vfsp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
ENTRY;
diff --git a/sys/coda/coda_vfsops.h b/sys/coda/coda_vfsops.h
index a2fd8e248e5..f75127731cf 100644
--- a/sys/coda/coda_vfsops.h
+++ b/sys/coda/coda_vfsops.h
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vfsops.h,v 1.10 2004/04/21 01:05:35 christos Exp $ */
+/* $NetBSD: coda_vfsops.h,v 1.11 2004/04/27 17:37:30 jrf Exp $ */
/*
*
@@ -51,7 +51,7 @@ int coda_mount(struct mount *, const char *, void *, struct nameidata *,
int coda_start(struct mount *, int, struct proc *);
int coda_unmount(struct mount *, int, struct proc *);
int coda_root(struct mount *, struct vnode **);
-int coda_quotactl(struct mount *, int, uid_t, caddr_t, struct proc *);
+int coda_quotactl(struct mount *, int, uid_t, void *, struct proc *);
int coda_nb_statvfs(struct mount *, struct statvfs *, struct proc *);
int coda_sync(struct mount *, int, struct ucred *, struct proc *);
int coda_vget(struct mount *, ino_t, struct vnode **);
diff --git a/sys/fs/adosfs/advfsops.c b/sys/fs/adosfs/advfsops.c
index a34444e8faa..f5d9964e54e 100644
--- a/sys/fs/adosfs/advfsops.c
+++ b/sys/fs/adosfs/advfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.13 2004/04/25 16:42:40 simonb Exp $ */
+/* $NetBSD: advfsops.c,v 1.14 2004/04/27 17:37:30 jrf Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.13 2004/04/25 16:42:40 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.14 2004/04/27 17:37:30 jrf Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -65,7 +65,7 @@ int adosfs_mount __P((struct mount *, const char *, void *, struct nameidata *,
int adosfs_start __P((struct mount *, int, struct proc *));
int adosfs_unmount __P((struct mount *, int, struct proc *));
int adosfs_root __P((struct mount *, struct vnode **));
-int adosfs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
+int adosfs_quotactl __P((struct mount *, int, uid_t, void *, struct proc *));
int adosfs_statvfs __P((struct mount *, struct statvfs *, struct proc *));
int adosfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
int adosfs_vget __P((struct mount *, ino_t, struct vnode **));
@@ -791,7 +791,7 @@ adosfs_quotactl(mp, cmds, uid, arg, p)
struct mount *mp;
int cmds;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
return(EOPNOTSUPP);
diff --git a/sys/fs/cd9660/cd9660_extern.h b/sys/fs/cd9660/cd9660_extern.h
index 3649e763865..8492d7fa6af 100644
--- a/sys/fs/cd9660/cd9660_extern.h
+++ b/sys/fs/cd9660/cd9660_extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_extern.h,v 1.8 2004/04/21 01:05:37 christos Exp $ */
+/* $NetBSD: cd9660_extern.h,v 1.9 2004/04/27 17:37:30 jrf Exp $ */
/*-
* Copyright (c) 1994
@@ -88,7 +88,7 @@ int cd9660_mount __P((struct mount *,
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 **));
-int cd9660_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
+int cd9660_quotactl __P((struct mount *, int, uid_t, void *, struct proc *));
int cd9660_statvfs __P((struct mount *, struct statvfs *, struct proc *));
int cd9660_sync __P((struct mount *, int, struct ucred *, struct proc *));
int cd9660_vget __P((struct mount *, ino_t, struct vnode **));
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 24d3f5e5bcf..6ac2fd536ca 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vfsops.c,v 1.12 2004/04/21 01:05:37 christos Exp $ */
+/* $NetBSD: cd9660_vfsops.c,v 1.13 2004/04/27 17:37:30 jrf Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.12 2004/04/21 01:05:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.13 2004/04/27 17:37:30 jrf Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -604,7 +604,7 @@ cd9660_quotactl(mp, cmd, uid, arg, p)
struct mount *mp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/fs/filecorefs/filecore_extern.h b/sys/fs/filecorefs/filecore_extern.h
index c45b77fa894..cb41c6df9e5 100644
--- a/sys/fs/filecorefs/filecore_extern.h
+++ b/sys/fs/filecorefs/filecore_extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_extern.h,v 1.7 2004/04/21 01:05:37 christos Exp $ */
+/* $NetBSD: filecore_extern.h,v 1.8 2004/04/27 17:37:30 jrf Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -110,7 +110,7 @@ int filecore_mount __P((struct mount *,
int filecore_start __P((struct mount *, int, struct proc *));
int filecore_unmount __P((struct mount *, int, struct proc *));
int filecore_root __P((struct mount *, struct vnode **));
-int filecore_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
+int filecore_quotactl __P((struct mount *, int, uid_t, void *, struct proc *));
int filecore_statvfs __P((struct mount *, struct statvfs *, struct proc *));
int filecore_sync __P((struct mount *, int, struct ucred *, struct proc *));
int filecore_vget __P((struct mount *, ino_t, struct vnode **));
diff --git a/sys/fs/filecorefs/filecore_vfsops.c b/sys/fs/filecorefs/filecore_vfsops.c
index 99fa26911f5..dac29e12724 100644
--- a/sys/fs/filecorefs/filecore_vfsops.c
+++ b/sys/fs/filecorefs/filecore_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_vfsops.c,v 1.10 2004/04/21 01:05:37 christos Exp $ */
+/* $NetBSD: filecore_vfsops.c,v 1.11 2004/04/27 17:37:30 jrf Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.10 2004/04/21 01:05:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.11 2004/04/27 17:37:30 jrf Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -480,7 +480,7 @@ filecore_quotactl(mp, cmd, uid, arg, p)
struct mount *mp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 458c3a9bdc4..3d34b2fdf59 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.15 2004/04/27 17:25:50 jdolecek Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.16 2004/04/27 17:37:30 jrf Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.15 2004/04/27 17:25:50 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.16 2004/04/27 17:37:30 jrf Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -87,7 +87,7 @@ int msdosfs_mount __P((struct mount *, const char *, void *,
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 **));
-int msdosfs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
+int msdosfs_quotactl __P((struct mount *, int, uid_t, void *, struct proc *));
int msdosfs_statvfs __P((struct mount *, struct statvfs *, struct proc *));
int msdosfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
int msdosfs_vget __P((struct mount *, ino_t, struct vnode **));
@@ -860,7 +860,7 @@ msdosfs_quotactl(mp, cmds, uid, arg, p)
struct mount *mp;
int cmds;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 69f936d4c62..8b39efa2093 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_vfsops.c,v 1.18 2004/04/21 01:05:38 christos Exp $ */
+/* $NetBSD: ntfs_vfsops.c,v 1.19 2004/04/27 17:37:30 jrf Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.18 2004/04/21 01:05:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.19 2004/04/27 17:37:30 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@ static int ntfs_mount __P((struct mount *, char *, caddr_t,
static int ntfs_mount __P((struct mount *, const char *, void *,
struct nameidata *, struct proc *));
#endif
-static int ntfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
+static int ntfs_quotactl __P((struct mount *, int, uid_t, void *,
struct proc *));
static int ntfs_root __P((struct mount *, struct vnode **));
static int ntfs_start __P((struct mount *, int, struct proc *));
@@ -750,7 +750,7 @@ ntfs_quotactl (
struct mount *mp,
int cmds,
uid_t uid,
- caddr_t arg,
+ void *arg,
struct proc *p)
{
diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c
index 0dda41609b3..4e22691d85f 100644
--- a/sys/fs/smbfs/smbfs_vfsops.c
+++ b/sys/fs/smbfs/smbfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_vfsops.c,v 1.38 2004/04/26 20:38:22 christos Exp $ */
+/* $NetBSD: smbfs_vfsops.c,v 1.39 2004/04/27 17:37:30 jrf Exp $ */
/*
* Copyright (c) 2000-2001, Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_vfsops.c,v 1.38 2004/04/26 20:38:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_vfsops.c,v 1.39 2004/04/27 17:37:30 jrf Exp $");
#ifdef _KERNEL_OPT
#include "opt_quota.h"
@@ -95,7 +95,7 @@ static MALLOC_DEFINE(M_SMBFSHASH, "SMBFS hash", "SMBFS hash table");
int smbfs_mount(struct mount *, const char *, void *,
struct nameidata *, struct proc *);
-int smbfs_quotactl(struct mount *, int, uid_t, caddr_t, struct proc *);
+int smbfs_quotactl(struct mount *, int, uid_t, void *, struct proc *);
int smbfs_root(struct mount *, struct vnode **);
static int smbfs_setroot(struct mount *);
int smbfs_start(struct mount *, int, struct proc *);
@@ -350,7 +350,7 @@ smbfs_quotactl(mp, cmd, uid, arg, p)
struct mount *mp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
SMBVDEBUG("return EOPNOTSUPP\n");
diff --git a/sys/fs/union/union_subr.c b/sys/fs/union/union_subr.c
index 50aa6854fbb..beda91ba117 100644
--- a/sys/fs/union/union_subr.c
+++ b/sys/fs/union/union_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: union_subr.c,v 1.8 2003/10/15 11:28:59 hannken Exp $ */
+/* $NetBSD: union_subr.c,v 1.9 2004/04/27 17:37:30 jrf Exp $ */
/*
* Copyright (c) 1994
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.8 2003/10/15 11:28:59 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.9 2004/04/27 17:37:30 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ union_init()
for (i = 0; i < NHASH; i++)
LIST_INIT(&unhead[i]);
- memset((caddr_t) unvplock, 0, sizeof(unvplock));
+ memset(unvplock, 0, sizeof(unvplock));
}
/*
@@ -162,7 +162,7 @@ union_list_unlock(ix)
if (unvplock[ix] & UN_WANTED) {
unvplock[ix] &= ~UN_WANTED;
- wakeup((caddr_t) &unvplock[ix]);
+ wakeup(&unvplock[ix]);
}
}
diff --git a/sys/fs/union/union_vfsops.c b/sys/fs/union/union_vfsops.c
index b0ac4b75f59..42a303d50a9 100644
--- a/sys/fs/union/union_vfsops.c
+++ b/sys/fs/union/union_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: union_vfsops.c,v 1.12 2004/04/21 01:05:38 christos Exp $ */
+/* $NetBSD: union_vfsops.c,v 1.13 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1994 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.12 2004/04/21 01:05:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.13 2004/04/27 17:37:31 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,7 @@ int union_mount __P((struct mount *, const char *, void *, struct nameidata *,
int union_start __P((struct mount *, int, struct proc *));
int union_unmount __P((struct mount *, int, struct proc *));
int union_root __P((struct mount *, struct vnode **));
-int union_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
+int union_quotactl __P((struct mount *, int, uid_t, void *, struct proc *));
int union_statvfs __P((struct mount *, struct statvfs *, struct proc *));
int union_sync __P((struct mount *, int, struct ucred *, struct proc *));
int union_vget __P((struct mount *, ino_t, struct vnode **));
@@ -466,7 +466,7 @@ union_quotactl(mp, cmd, uid, arg, p)
struct mount *mp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/fs/union/union_vnops.c b/sys/fs/union/union_vnops.c
index 03ff0cc0458..c58e7f72645 100644
--- a/sys/fs/union/union_vnops.c
+++ b/sys/fs/union/union_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: union_vnops.c,v 1.9 2004/04/21 01:05:38 christos Exp $ */
+/* $NetBSD: union_vnops.c,v 1.10 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_vnops.c,v 1.9 2004/04/21 01:05:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vnops.c,v 1.10 2004/04/27 17:37:31 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1096,7 +1096,7 @@ union_ioctl(v)
struct vop_ioctl_args /* {
struct vnode *a_vp;
int a_command;
- caddr_t a_data;
+ void *a_data;
int a_fflag;
struct ucred *a_cred;
struct proc *a_p;
@@ -1799,7 +1799,7 @@ start:
panic("union: locking against myself");
#endif
un->un_flags |= UN_WANTED;
- tsleep((caddr_t)&un->un_flags, PINOD, "unionlk2", 0);
+ tsleep(&un->un_flags, PINOD, "unionlk2", 0);
goto start;
}
@@ -1856,7 +1856,7 @@ union_unlock(v)
if (un->un_flags & UN_WANTED) {
un->un_flags &= ~UN_WANTED;
- wakeup((caddr_t) &un->un_flags);
+ wakeup( &un->un_flags);
}
#ifdef DIAGNOSTIC
@@ -1964,7 +1964,7 @@ union_advlock(v)
{
struct vop_advlock_args /* {
struct vnode *a_vp;
- caddr_t a_id;
+ void *a_id;
int a_op;
struct flock *a_fl;
int a_flags;
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index 22682d2839e..424c52993d4 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dead_vnops.c,v 1.34 2004/01/25 18:06:48 hannken Exp $ */
+/* $NetBSD: dead_vnops.c,v 1.35 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dead_vnops.c,v 1.34 2004/01/25 18:06:48 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dead_vnops.c,v 1.35 2004/04/27 17:37:31 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -234,7 +234,7 @@ dead_ioctl(v)
struct vop_ioctl_args /* {
struct vnode *a_vp;
u_long a_command;
- caddr_t a_data;
+ void *a_data;
int a_fflag;
struct ucred *a_cred;
struct proc *a_p;
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index dbf6c2e9e60..24261d57e55 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vfsops.c,v 1.48 2004/04/21 02:38:16 christos Exp $ */
+/* $NetBSD: fdesc_vfsops.c,v 1.49 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.48 2004/04/21 02:38:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.49 2004/04/27 17:37:31 jrf Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -65,7 +65,7 @@ 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 *));
-int fdesc_quotactl __P((struct mount *, int, uid_t, caddr_t,
+int fdesc_quotactl __P((struct mount *, int, uid_t, void *,
struct proc *));
int fdesc_statvfs __P((struct mount *, struct statvfs *, struct proc *));
int fdesc_sync __P((struct mount *, int, struct ucred *, struct proc *));
@@ -188,7 +188,7 @@ fdesc_quotactl(mp, cmd, uid, arg, p)
struct mount *mp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index ec74c843b56..96c560a4af0 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vnops.c,v 1.80 2004/04/21 01:05:41 christos Exp $ */
+/* $NetBSD: fdesc_vnops.c,v 1.81 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.80 2004/04/21 01:05:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.81 2004/04/27 17:37:31 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -263,7 +263,7 @@ out:;
if (fdcache_lock & FDL_WANT) {
fdcache_lock &= ~FDL_WANT;
- wakeup((caddr_t) &fdcache_lock);
+ wakeup(&fdcache_lock);
}
return (error);
@@ -714,7 +714,7 @@ fdesc_readdir(v)
error = 0;
i = uio->uio_offset;
- memset((caddr_t)&d, 0, UIO_MX);
+ memset(&d, 0, UIO_MX);
d.d_reclen = UIO_MX;
if (ap->a_ncookies)
ncookies = (uio->uio_resid / UIO_MX);
@@ -757,7 +757,7 @@ fdesc_readdir(v)
memcpy(d.d_name, ft->ft_name, ft->ft_namlen + 1);
d.d_type = ft->ft_type;
- if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0)
+ if ((error = uiomove(&d, UIO_MX, uio)) != 0)
break;
if (cookies)
*cookies++ = i + 1;
@@ -792,7 +792,7 @@ fdesc_readdir(v)
break;
}
- if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0)
+ if ((error = uiomove(&d, UIO_MX, uio)) != 0)
break;
if (cookies)
*cookies++ = i + 1;
@@ -898,7 +898,7 @@ fdesc_ioctl(v)
struct vop_ioctl_args /* {
struct vnode *a_vp;
u_long a_command;
- caddr_t a_data;
+ void *a_data;
int a_fflag;
struct ucred *a_cred;
struct proc *a_p;
diff --git a/sys/miscfs/genfs/layer_extern.h b/sys/miscfs/genfs/layer_extern.h
index 53179040921..adcb6bc8903 100644
--- a/sys/miscfs/genfs/layer_extern.h
+++ b/sys/miscfs/genfs/layer_extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_extern.h,v 1.12 2004/04/21 01:05:41 christos Exp $ */
+/* $NetBSD: layer_extern.h,v 1.13 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -84,7 +84,7 @@ struct vnode *
/* vfs routines */
int layerfs_start __P((struct mount *, int, struct proc *));
int layerfs_root __P((struct mount *, struct vnode **));
-int layerfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
+int layerfs_quotactl __P((struct mount *, int, uid_t, void *,
struct proc *));
int layerfs_statvfs __P((struct mount *, struct statvfs *, struct proc *));
int layerfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
diff --git a/sys/miscfs/genfs/layer_vfsops.c b/sys/miscfs/genfs/layer_vfsops.c
index 4dd242582d4..d7a7f9cc871 100644
--- a/sys/miscfs/genfs/layer_vfsops.c
+++ b/sys/miscfs/genfs/layer_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_vfsops.c,v 1.14 2004/04/21 01:05:41 christos Exp $ */
+/* $NetBSD: layer_vfsops.c,v 1.15 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.14 2004/04/21 01:05:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.15 2004/04/27 17:37:31 jrf Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -135,7 +135,7 @@ layerfs_quotactl(mp, cmd, uid, arg, p)
struct mount *mp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index aae80ed1a2c..fa4139b7c35 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kernfs_vfsops.c,v 1.60 2004/04/21 02:41:16 christos Exp $ */
+/* $NetBSD: kernfs_vfsops.c,v 1.61 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kernfs_vfsops.c,v 1.60 2004/04/21 02:41:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kernfs_vfsops.c,v 1.61 2004/04/27 17:37:31 jrf Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -73,7 +73,7 @@ int kernfs_mount __P((struct mount *, const char *, void *,
int kernfs_start __P((struct mount *, int, struct proc *));
int kernfs_unmount __P((struct mount *, int, struct proc *));
int kernfs_statvfs __P((struct mount *, struct statvfs *, struct proc *));
-int kernfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
+int kernfs_quotactl __P((struct mount *, int, uid_t, void *,
struct proc *));
int kernfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
int kernfs_vget __P((struct mount *, ino_t, struct vnode **));
@@ -217,7 +217,7 @@ kernfs_quotactl(mp, cmd, uid, arg, p)
struct mount *mp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 51db8b017f0..07b75e59506 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: portal_vfsops.c,v 1.42 2004/04/21 02:40:42 christos Exp $ */
+/* $NetBSD: portal_vfsops.c,v 1.43 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: portal_vfsops.c,v 1.42 2004/04/21 02:40:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: portal_vfsops.c,v 1.43 2004/04/27 17:37:31 jrf Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -73,7 +73,7 @@ int portal_mount __P((struct mount *, const char *, void *,
int portal_start __P((struct mount *, int, struct proc *));
int portal_unmount __P((struct mount *, int, struct proc *));
int portal_root __P((struct mount *, struct vnode **));
-int portal_quotactl __P((struct mount *, int, uid_t, caddr_t,
+int portal_quotactl __P((struct mount *, int, uid_t, void *,
struct proc *));
int portal_statvfs __P((struct mount *, struct statvfs *, struct proc *));
int portal_sync __P((struct mount *, int, struct ucred *, struct proc *));
@@ -252,7 +252,7 @@ portal_quotactl(mp, cmd, uid, arg, p)
struct mount *mp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 43e8ee296c4..e91e8e24036 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vfsops.c,v 1.54 2004/04/21 02:42:28 christos Exp $ */
+/* $NetBSD: procfs_vfsops.c,v 1.55 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.54 2004/04/21 02:42:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.55 2004/04/27 17:37:31 jrf Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -107,7 +107,7 @@ 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 *));
-int procfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
+int procfs_quotactl __P((struct mount *, int, uid_t, void *,
struct proc *));
int procfs_statvfs __P((struct mount *, struct statvfs *, struct proc *));
int procfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
@@ -255,7 +255,7 @@ procfs_quotactl(mp, cmds, uid, arg, p)
struct mount *mp;
int cmds;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index f4178f69252..ff8b49344fd 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vfsops.c,v 1.136 2004/04/21 01:05:43 christos Exp $ */
+/* $NetBSD: nfs_vfsops.c,v 1.137 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.136 2004/04/21 01:05:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.137 2004/04/27 17:37:31 jrf Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1077,7 +1077,7 @@ nfs_quotactl(mp, cmd, uid, arg, p)
struct mount *mp;
int cmd;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 413b08ccb08..249ed9b989e 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsmount.h,v 1.30 2004/04/21 01:05:43 christos Exp $ */
+/* $NetBSD: nfsmount.h,v 1.31 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -184,7 +184,7 @@ void nfs_decode_args __P((struct nfsmount *, struct nfs_args *));
int nfs_start __P((struct mount *mp, int flags, struct proc *p));
int nfs_unmount __P((struct mount *mp, int mntflags, struct proc *p));
int nfs_root __P((struct mount *mp, struct vnode **vpp));
-int nfs_quotactl __P((struct mount *mp, int cmds, uid_t uid, caddr_t arg,
+int nfs_quotactl __P((struct mount *mp, int cmds, uid_t uid, void *arg,
struct proc *p));
int nfs_statvfs __P((struct mount *mp, struct statvfs *sbp, struct proc *p));
int nfs_sync __P((struct mount *mp, int waitfor, struct ucred *cred,
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 88a4d0dba05..c18810749b5 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mount.h,v 1.119 2004/04/21 01:05:43 christos Exp $ */
+/* $NetBSD: mount.h,v 1.120 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@@ -225,7 +225,7 @@ struct vfsops {
int (*vfs_start) __P((struct mount *, int, struct proc *));
int (*vfs_unmount) __P((struct mount *, int, struct proc *));
int (*vfs_root) __P((struct mount *, struct vnode **));
- int (*vfs_quotactl) __P((struct mount *, int, uid_t, caddr_t,
+ int (*vfs_quotactl) __P((struct mount *, int, uid_t, void *,
struct proc *));
int (*vfs_statvfs) __P((struct mount *, struct statvfs *,
struct proc *));
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index 21459193cee..83d52f0d4eb 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.h,v 1.17 2003/08/07 16:34:44 agc Exp $ */
+/* $NetBSD: quota.h,v 1.18 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -198,7 +198,7 @@ int quotaoff __P((struct proc *, struct mount *, int));
int quotaon __P((struct proc *, struct mount *, int, caddr_t));
int setquota __P((struct mount *, u_long, int, caddr_t));
int setuse __P((struct mount *, u_long, int, caddr_t));
-int ufs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
+int ufs_quotactl __P((struct mount *, int, uid_t, void *, struct proc *));
__END_DECLS
#ifdef DIAGNOSTIC
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index d09f1682718..cb8b703253a 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_extern.h,v 1.38 2003/08/07 16:34:45 agc Exp $ */
+/* $NetBSD: ufs_extern.h,v 1.39 2004/04/27 17:37:31 jrf Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -155,7 +155,7 @@ void ufs_reinit __P((void));
void ufs_done __P((void));
int ufs_start __P((struct mount *, int, struct proc *));
int ufs_root __P((struct mount *, struct vnode **));
-int ufs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
+int ufs_quotactl __P((struct mount *, int, uid_t, void *, struct proc *));
int ufs_fhtovp __P((struct mount *, struct ufid *, struct vnode **));
int ufs_check_export __P((struct mount *, struct mbuf *, int *,
struct ucred **));
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index ceea03c9587..b5245ca2b38 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vfsops.c,v 1.18 2003/08/07 16:34:47 agc Exp $ */
+/* $NetBSD: ufs_vfsops.c,v 1.19 2004/04/27 17:37:31 jrf Exp $ */
/*
* Copyright (c) 1991, 1993, 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.18 2003/08/07 16:34:47 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.19 2004/04/27 17:37:31 jrf Exp $");
#include "opt_quota.h"
@@ -99,7 +99,7 @@ ufs_quotactl(mp, cmds, uid, arg, p)
struct mount *mp;
int cmds;
uid_t uid;
- caddr_t arg;
+ void *arg;
struct proc *p;
{