 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_quotactl.c,v 1.4 2012/01/29 06:34:57 dholland Exp $	*/
+/*	$NetBSD: vfs_quotactl.c,v 1.5 2012/01/29 06:36:06 dholland Exp $	*/
 /*
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -70,85 +70,178 @@
+ *
  *	@(#)ufs_quota.c	8.5 (Berkeley) 5/20/95
  *	From NetBSD: ufs_quota.c,v 1.70 2011/03/24 17:05:46 bouyer Exp
  */
 /*
  * Note that both of the copyrights above are moderately spurious;
  * this code should almost certainly have the Copyright 2010 Manuel
  * Bouyer notice and license found in e.g. sys/ufs/ufs/quota2_subr.c.
  * However, they're what was on the files this code was sliced out of.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.4 2012/01/29 06:34:57 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.5 2012/01/29 06:36:06 dholland Exp $");
 #include <sys/mount.h>
 #include <sys/quotactl.h>
 #include <quota/quotaprop.h>
 static int
 vfs_quotactl_getversion(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct vfs_quotactl_args args;
 	args.qc_type = QCT_PROPLIB;
 	args.u.proplib.qc_cmddict = cmddict;
 	args.u.proplib.qc_q2type = q2type;
 	args.u.proplib.qc_datas = datas;
 	return VFS_QUOTACTL(mp, QUOTACTL_GETVERSION, &args);
+}
 static int
 vfs_quotactl_quotaon(struct mount *mp,
 		     prop_dictionary_t cmddict, int q2type,
 		     prop_array_t datas)
+{
 	struct vfs_quotactl_args args;
 	args.qc_type = QCT_PROPLIB;
 	args.u.proplib.qc_cmddict = cmddict;
 	args.u.proplib.qc_q2type = q2type;
 	args.u.proplib.qc_datas = datas;
 	return VFS_QUOTACTL(mp, QUOTACTL_QUOTAON, &args);
+}
 static int
 vfs_quotactl_quotaoff(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct vfs_quotactl_args args;
 	args.qc_type = QCT_PROPLIB;
 	args.u.proplib.qc_cmddict = cmddict;
 	args.u.proplib.qc_q2type = q2type;
 	args.u.proplib.qc_datas = datas;
 	return VFS_QUOTACTL(mp, QUOTACTL_QUOTAOFF, &args);
+}
 static int
 vfs_quotactl_get(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct vfs_quotactl_args args;
 	args.qc_type = QCT_PROPLIB;
 	args.u.proplib.qc_cmddict = cmddict;
 	args.u.proplib.qc_q2type = q2type;
 	args.u.proplib.qc_datas = datas;
 	return VFS_QUOTACTL(mp, QUOTACTL_GET, &args);
+}
 static int
 vfs_quotactl_set(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct vfs_quotactl_args args;
 	args.qc_type = QCT_PROPLIB;
 	args.u.proplib.qc_cmddict = cmddict;
 	args.u.proplib.qc_q2type = q2type;
 	args.u.proplib.qc_datas = datas;
 	return VFS_QUOTACTL(mp, QUOTACTL_SET, &args);
+}
 static int
 vfs_quotactl_getall(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct vfs_quotactl_args args;
 	args.qc_type = QCT_PROPLIB;
 	args.u.proplib.qc_cmddict = cmddict;
 	args.u.proplib.qc_q2type = q2type;
 	args.u.proplib.qc_datas = datas;
 	return VFS_QUOTACTL(mp, QUOTACTL_GETALL, &args);
+}
 static int
 vfs_quotactl_clear(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct vfs_quotactl_args args;
 	args.qc_type = QCT_PROPLIB;
 	args.u.proplib.qc_cmddict = cmddict;
 	args.u.proplib.qc_q2type = q2type;
 	args.u.proplib.qc_datas = datas;
 	return VFS_QUOTACTL(mp, QUOTACTL_CLEAR, &args);
+}
 static int
 vfs_quotactl_cmd(struct mount *mp, prop_dictionary_t cmddict)
+{
 	int error;
 	const char *cmd, *type;
 	int op;
 	prop_array_t datas;
 	int q2type;
 	if (!prop_dictionary_get_cstring_nocopy(cmddict, "command", &cmd))
 		return EINVAL;
 	if (!prop_dictionary_get_cstring_nocopy(cmddict, "type", &type))
 		return EINVAL;
 	if (!strcmp(type, QUOTADICT_CLASS_USER)) {
 		q2type = QUOTA_CLASS_USER;
 	} else if (!strcmp(type, QUOTADICT_CLASS_GROUP)) {
 		q2type = QUOTA_CLASS_GROUP;
 	} else {
 		/* XXX this is a bad errno for this case */
 		return EOPNOTSUPP;
+	}
 	datas = prop_dictionary_get(cmddict, "data");
 	if (datas == NULL || prop_object_type(datas) != PROP_TYPE_ARRAY)
 		return EINVAL;
 	prop_object_retain(datas);
 	prop_dictionary_remove(cmddict, "data"); /* prepare for return */
 	if (strcmp(cmd, "get version") == 0) {
-		op = QUOTACTL_GETVERSION;
+		error = vfs_quotactl_getversion(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "quotaon") == 0) {
-		op = QUOTACTL_QUOTAON;
+		error = vfs_quotactl_quotaon(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "quotaoff") == 0) {
-		op = QUOTACTL_QUOTAOFF;
+		error = vfs_quotactl_quotaoff(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "get") == 0) {
-		op = QUOTACTL_GET;
+		error = vfs_quotactl_get(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "set") == 0) {
-		op = QUOTACTL_SET;
+		error = vfs_quotactl_set(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "getall") == 0) {
-		op = QUOTACTL_GETALL;
+		error = vfs_quotactl_getall(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "clear") == 0) {
-		op = QUOTACTL_CLEAR;
+		error = vfs_quotactl_clear(mp, cmddict, q2type, datas);
 	} else {
 		/* XXX this a bad errno for this case */
 		error = EOPNOTSUPP;
 		goto fail;
+	}
 	error = VFS_QUOTACTL(mp, op, cmddict, q2type, datas);
  fail:
 	error = (prop_dictionary_set_int8(cmddict, "return",
 	    error) ? 0 : ENOMEM);
 	prop_object_release(datas);
 	return error;
+}
 int
 vfs_quotactl(struct mount *mp, prop_dictionary_t dict)
+{
 	prop_dictionary_t cmddict;
 	prop_array_t commands;
 	prop_object_iterator_t iter;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_subr.c,v 1.428 2012/01/29 06:34:57 dholland Exp $	*/
+/*	$NetBSD: vfs_subr.c,v 1.429 2012/01/29 06:36:06 dholland Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -57,27 +57,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.428 2012/01/29 06:34:57 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.429 2012/01/29 06:36:06 dholland Exp $");
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/dirent.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 @@ -996,35 +996,34 @@ VFS_ROOT(struct mount *mp, struct vnode
 	if ((mp->mnt_iflag & IMNT_MPSAFE) == 0) {
 		KERNEL_LOCK(1, NULL);
+	}
 	error = (*(mp->mnt_op->vfs_root))(mp, a);
 	if ((mp->mnt_iflag & IMNT_MPSAFE) == 0) {
 		KERNEL_UNLOCK_ONE(NULL);
+	}
 	return error;
+}
 int
-VFS_QUOTACTL(struct mount *mp, int op, prop_dictionary_t cmddict, int objtype,
+VFS_QUOTACTL(struct mount *mp, int op, struct vfs_quotactl_args *args)
 	     prop_array_t datas)
+{
 	int error;
 	if ((mp->mnt_iflag & IMNT_MPSAFE) == 0) {
 		KERNEL_LOCK(1, NULL);
+	}
-	error = (*(mp->mnt_op->vfs_quotactl))(mp, op, cmddict, objtype, datas);
+	error = (*(mp->mnt_op->vfs_quotactl))(mp, op, args);
 	if ((mp->mnt_iflag & IMNT_MPSAFE) == 0) {
 		KERNEL_UNLOCK_ONE(NULL);
+	}
 	return error;
+}
 int
 VFS_STATVFS(struct mount *mp, struct statvfs *a)
+{
 	int error;
 	if ((mp->mnt_iflag & IMNT_MPSAFE) == 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: layer_extern.h,v 1.31 2012/01/29 06:34:58 dholland Exp $	*/
+/*	$NetBSD: layer_extern.h,v 1.32 2012/01/29 06:36:06 dholland Exp $	*/
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
  * All rights reserved.
+ *
  * This software was written by William Studenmund of the
  * Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -78,27 +78,27 @@ void	layerfs_init(void);
 void	layerfs_done(void);
 int	layer_node_alloc(struct mount *, struct vnode *, struct vnode **);
 int	layer_node_create(struct mount *, struct vnode *, struct vnode **);
 struct vnode *layer_node_find(struct mount *, struct vnode *);
 #define LOG2_SIZEVNODE	7		/* log2(sizeof struct vnode) */
 #define LAYER_NHASH(lmp, vp) \
 	(&((lmp)->layerm_node_hashtbl[(((u_long)vp)>>LOG2_SIZEVNODE) & \
 		(lmp)->layerm_node_hash]))
 /* VFS routines */
 int	layerfs_start(struct mount *, int);
 int	layerfs_root(struct mount *, struct vnode **);
-int	layerfs_quotactl(struct mount *, int, prop_dictionary_t, int, prop_array_t);
+int	layerfs_quotactl(struct mount *, int, struct vfs_quotactl_args *);
 int	layerfs_statvfs(struct mount *, struct statvfs *);
 int	layerfs_sync(struct mount *, int, struct kauth_cred *);
 int	layerfs_vget(struct mount *, ino_t, struct vnode **);
 int	layerfs_fhtovp(struct mount *, struct fid *, struct vnode **);
 int	layerfs_vptofh(struct vnode *, struct fid *, size_t *);
 int	layerfs_snapshot(struct mount *, struct vnode *, struct timespec *);
 int	layerfs_renamelock_enter(struct mount *);
 void	layerfs_renamelock_exit(struct mount *);
 /* VOP routines */
 int	layer_bypass(void *);
 int	layer_getattr(void *);
 int	layer_inactive(void *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: layer_vfsops.c,v 1.36 2012/01/29 06:34:58 dholland Exp $	*/
+/*	$NetBSD: layer_vfsops.c,v 1.37 2012/01/29 06:36:06 dholland Exp $	*/
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
  * All rights reserved.
+ *
  * This software was written by William Studenmund of the
  * Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -64,27 +64,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: Id: lofs_vfsops.c,v 1.9 1992/05/30 10:26:24 jsp Exp
  *	from: @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
  *	@(#)null_vfsops.c	8.7 (Berkeley) 5/14/95
  */
 /*
  * Generic layer VFS operations.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.36 2012/01/29 06:34:58 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.37 2012/01/29 06:36:06 dholland Exp $");
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
 #include <sys/kauth.h>
 #include <sys/module.h>
 #include <miscfs/genfs/layer.h>
 #include <miscfs/genfs/layer_extern.h>
 @@ -131,32 +131,30 @@ layerfs_root(struct mount *mp, struct vn
 		*vpp = NULL;
 		return EINVAL;
+	}
 	/*
 	 * Return root vnode with locked and with a reference held.
 	 */
 	vref(vp);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	*vpp = vp;
 	return 0;
+}
 int
-layerfs_quotactl(struct mount *mp, int op, prop_dictionary_t dict, int objtype,
+layerfs_quotactl(struct mount *mp, int op, struct vfs_quotactl_args *args)
 		 prop_array_t datas)
+{
-	return VFS_QUOTACTL(MOUNTTOLAYERMOUNT(mp)->layerm_vfs, op, dict,
+	return VFS_QUOTACTL(MOUNTTOLAYERMOUNT(mp)->layerm_vfs, op, args);
 			    objtype, datas);
+}
 int
 layerfs_statvfs(struct mount *mp, struct statvfs *sbp)
+{
 	struct statvfs *sbuf;
 	int error;
 	sbuf = kmem_zalloc(sizeof(*sbuf), KM_SLEEP);
 	if (sbuf == NULL) {
 		return ENOMEM;
+	}
 	error = VFS_STATVFS(MOUNTTOLAYERMOUNT(mp)->layerm_vfs, sbuf);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mount.h,v 1.204 2012/01/29 06:34:57 dholland Exp $	*/
+/*	$NetBSD: mount.h,v 1.205 2012/01/29 06:36:06 dholland Exp $	*/
 /*
  * Copyright (c) 1989, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -182,44 +182,44 @@ struct mount {
 #define	VFS_MAXID	20		/* number of valid vfs ids */
 #define	CTL_VFSGENCTL_NAMES { \
 	{ 0, 0 }, \
 	{ "maxtypenum", CTLTYPE_INT }, \
 	{ "conf", CTLTYPE_NODE }, 	/* Special */ \
 	{ "usermount", CTLTYPE_INT }, \
 	{ "magiclinks", CTLTYPE_INT }, \
+}
 #if defined(_KERNEL)
 #include <prop/proplib.h>
 struct vfs_quotactl_args;
 #if __STDC__
 struct nameidata;
 #endif
 /*
  * Operations supported on mounted file system.
  */
 struct vfsops {
 	const char *vfs_name;
 	size_t	vfs_min_mount_data;
 	int	(*vfs_mount)	(struct mount *, const char *, void *,
 				    size_t *);
 	int	(*vfs_start)	(struct mount *, int);
 	int	(*vfs_unmount)	(struct mount *, int);
 	int	(*vfs_root)	(struct mount *, struct vnode **);
-	int	(*vfs_quotactl)	(struct mount *, int, prop_dictionary_t, int,
+	int	(*vfs_quotactl)	(struct mount *, int, struct vfs_quotactl_args *);
 				    prop_array_t);
 	int	(*vfs_statvfs)	(struct mount *, struct statvfs *);
 	int	(*vfs_sync)	(struct mount *, int, struct kauth_cred *);
 	int	(*vfs_vget)	(struct mount *, ino_t, struct vnode **);
 	int	(*vfs_fhtovp)	(struct mount *, struct fid *,
 				    struct vnode **);
 	int	(*vfs_vptofh)	(struct vnode *, struct fid *, size_t *);
 	void	(*vfs_init)	(void);
 	void	(*vfs_reinit)	(void);
 	void	(*vfs_done)	(void);
 	int	(*vfs_mountroot)(void);
 	int	(*vfs_snapshot)	(struct mount *, struct vnode *,
 				    struct timespec *);
 	int	(*vfs_extattrctl) (struct mount *, int,
 @@ -234,53 +234,53 @@ struct vfsops {
 };
 /* XXX vget is actually file system internal. */
 #define VFS_VGET(MP, INO, VPP)    (*(MP)->mnt_op->vfs_vget)(MP, INO, VPP)
 #define VFS_RENAMELOCK_ENTER(MP)  (*(MP)->mnt_op->vfs_renamelock_enter)(MP)
 #define VFS_RENAMELOCK_EXIT(MP)   (*(MP)->mnt_op->vfs_renamelock_exit)(MP)
 #define VFS_FSYNC(MP, VP, FLG)	  (*(MP)->mnt_op->vfs_fsync)(VP, FLG)
 int	VFS_MOUNT(struct mount *, const char *, void *, size_t *);
 int	VFS_START(struct mount *, int);
 int	VFS_UNMOUNT(struct mount *, int);
 int	VFS_ROOT(struct mount *, struct vnode **);
-int	VFS_QUOTACTL(struct mount *, int, prop_dictionary_t, int, prop_array_t);
+int	VFS_QUOTACTL(struct mount *, int, struct vfs_quotactl_args *);
 int	VFS_STATVFS(struct mount *, struct statvfs *);
 int	VFS_SYNC(struct mount *, int, struct kauth_cred *);
 int	VFS_FHTOVP(struct mount *, struct fid *, struct vnode **);
 int	VFS_VPTOFH(struct vnode *, struct fid *, size_t *);
 int	VFS_SNAPSHOT(struct mount *, struct vnode *, struct timespec *);
 int	VFS_EXTATTRCTL(struct mount *, int, struct vnode *, int, const char *);
 int	VFS_SUSPENDCTL(struct mount *, int);
 #endif /* _KERNEL */
 #ifdef _KERNEL
 #if __STDC__
 struct mbuf;
 struct vnodeopv_desc;
 struct kauth_cred;
 #endif
 #define	VFS_MAX_MOUNT_DATA	8192
 #define VFS_PROTOS(fsname)						\
 int	fsname##_mount(struct mount *, const char *, void *,		\
 		size_t *);						\
 int	fsname##_start(struct mount *, int);				\
 int	fsname##_unmount(struct mount *, int);				\
 int	fsname##_root(struct mount *, struct vnode **);			\
-int	fsname##_quotactl(struct mount *, int, prop_dictionary_t, int, prop_array_t);	\
+int	fsname##_quotactl(struct mount *, int, struct vfs_quotactl_args *);	\
 int	fsname##_statvfs(struct mount *, struct statvfs *);		\
 int	fsname##_sync(struct mount *, int, struct kauth_cred *);	\
 int	fsname##_vget(struct mount *, ino_t, struct vnode **);		\
 int	fsname##_fhtovp(struct mount *, struct fid *, struct vnode **);	\
 int	fsname##_vptofh(struct vnode *, struct fid *, size_t *);	\
 void	fsname##_init(void);						\
 void	fsname##_reinit(void);						\
 void	fsname##_done(void);						\
 int	fsname##_mountroot(void);					\
 int	fsname##_snapshot(struct mount *, struct vnode *,		\
 		struct timespec *);					\
 int	fsname##_extattrctl(struct mount *, int, struct vnode *, int,	\
 		const char *);						\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quotactl.h,v 1.2 2012/01/29 06:34:57 dholland Exp $	*/
+/*	$NetBSD: quotactl.h,v 1.3 2012/01/29 06:36:06 dholland Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David A. Holland.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -36,14 +36,29 @@
  * really, anything that isn't libquota or inside the kernel) should
  * use the <quota.h> API instead.
  */
 /* Command codes. */
 #define QUOTACTL_GETVERSION	0
 #define QUOTACTL_QUOTAON	1
 #define QUOTACTL_QUOTAOFF	2
 #define QUOTACTL_GET		3
 #define QUOTACTL_SET		4
 #define QUOTACTL_GETALL		5
 #define QUOTACTL_CLEAR		6
 /* Argument encoding. */
 enum vfs_quotactl_argtypes {
 	QCT_PROPLIB,	/* getversion, quotaon/off, get, set, getall, clear */
 };
 struct vfs_quotactl_args {
 	enum vfs_quotactl_argtypes qc_type;
 	union {
 		struct {
 			prop_dictionary_t qc_cmddict;
 			int qc_q2type;
 			prop_array_t qc_datas;
 		} proplib;
 	} u;
 };
 #endif /* _SYS_QUOTACTL_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_extern.h,v 1.68 2012/01/29 06:34:58 dholland Exp $	*/
+/*	$NetBSD: ufs_extern.h,v 1.69 2012/01/29 06:36:07 dholland Exp $	*/
 /*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -139,43 +139,43 @@ int	ufs_parentcheck(struct vnode *, stru
 			int *, struct vnode **);
 int	ufs_blkatoff(struct vnode *, off_t, char **, struct buf **, bool);
 /* ufs_quota.c */
 /*
  * Flags to chkdq() and chkiq()
  */
 #define	FORCE	0x01	/* force usage changes independent of limits */
 void	ufsquota_init(struct inode *);
 void	ufsquota_free(struct inode *);
 int	chkdq(struct inode *, int64_t, kauth_cred_t, int);
 int	chkiq(struct inode *, int32_t, kauth_cred_t, int);
 int	quota_handle_cmd(struct mount *, struct lwp *, int,
-			 prop_dictionary_t, int, prop_array_t);
+			 struct vfs_quotactl_args *);
 int	qsync(struct mount *);
 /* ufs_quota1.c */
 int	quota1_umount(struct mount *, int);
 /* ufs_quota2.c */
 int	quota2_umount(struct mount *, int);
 /* ufs_vfsops.c */
 void	ufs_init(void);
 void	ufs_reinit(void);
 void	ufs_done(void);
 int	ufs_start(struct mount *, int);
 int	ufs_root(struct mount *, struct vnode **);
-int	ufs_quotactl(struct mount *, int, prop_dictionary_t, int, prop_array_t);
+int	ufs_quotactl(struct mount *, int, struct vfs_quotactl_args *);
 int	ufs_fhtovp(struct mount *, struct ufid *, struct vnode **);
 /* ufs_vnops.c */
 void	ufs_vinit(struct mount *, int (**)(void *),
 		  int (**)(void *), struct vnode **);
 int	ufs_makeinode(int, struct vnode *, const struct ufs_lookup_results *,
 		      struct vnode **, struct componentname *);
 int	ufs_gop_alloc(struct vnode *, off_t, off_t, int, kauth_cred_t);
 void	ufs_gop_markupdate(struct vnode *, int);
 /*
  * Snapshot function prototypes.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.c,v 1.71 2012/01/29 06:34:58 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.c,v 1.72 2012/01/29 06:36:07 dholland Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Robert Elz at The University of Melbourne.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs_quota.c	8.5 (Berkeley) 5/20/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.71 2012/01/29 06:34:58 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.72 2012/01/29 06:36:07 dholland Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/kauth.h>
 @@ -62,39 +62,40 @@ kmutex_t dqlock;
 kcondvar_t dqcv;
 /*
  * Code pertaining to management of the in-core dquot data structures.
  */
 #define DQHASH(dqvp, id) \
 	(((((long)(dqvp)) >> 8) + id) & dqhash)
 static LIST_HEAD(dqhashhead, dquot) *dqhashtbl;
 static u_long dqhash;
 static pool_cache_t dquot_cache;
 static int quota_handle_cmd_get_version(struct mount *, struct lwp *,
-    prop_dictionary_t, prop_array_t);
+    struct vfs_quotactl_args *args);
 static int quota_handle_cmd_get(struct mount *, struct lwp *,
-    prop_dictionary_t, int, prop_array_t);
+    struct vfs_quotactl_args *args);
 static int quota_handle_cmd_set(struct mount *, struct lwp *,
-    prop_dictionary_t, int, prop_array_t);
+    struct vfs_quotactl_args *args);
 static int quota_handle_cmd_getall(struct mount *, struct lwp *,
-    prop_dictionary_t, int, prop_array_t);
+    struct vfs_quotactl_args *args);
 static int quota_handle_cmd_clear(struct mount *, struct lwp *,
-    prop_dictionary_t, int, prop_array_t);
+    struct vfs_quotactl_args *args);
 static int quota_handle_cmd_quotaon(struct mount *, struct lwp *,
-    prop_dictionary_t, int, prop_array_t);
+    struct vfs_quotactl_args *args);
 static int quota_handle_cmd_quotaoff(struct mount *, struct lwp *,
-    prop_dictionary_t, int, prop_array_t);
+    struct vfs_quotactl_args *args);
 /*
  * Initialize the quota fields of an inode.
  */
 void
 ufsquota_init(struct inode *ip)
+{
 	int i;
 	for (i = 0; i < MAXQUOTAS; i++)
 		ip->i_dquot[i] = NODQUOT;
+}
 /*
 @@ -144,71 +145,77 @@ chkiq(struct inode *ip, int32_t change,
 #ifdef QUOTA
 	if (ip->i_ump->um_flags & UFS_QUOTA)
 		return chkiq1(ip, change, cred, flags);
 #endif
 #ifdef QUOTA2
 	if (ip->i_ump->um_flags & UFS_QUOTA2)
 		return chkiq2(ip, change, cred, flags);
 #endif
 	return 0;
+}
 int
 quota_handle_cmd(struct mount *mp, struct lwp *l, int op,
-		 prop_dictionary_t cmddict, int q2type, prop_array_t datas)
+		 struct vfs_quotactl_args *args)
+{
 	int error = 0;
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	switch (op) {
 	    case QUOTACTL_GETVERSION:
-		error = quota_handle_cmd_get_version(mp, l, cmddict, datas);
+		error = quota_handle_cmd_get_version(mp, l, args);
 		break;
 	    case QUOTACTL_QUOTAON:
-		error = quota_handle_cmd_quotaon(mp, l, cmddict,
+		error = quota_handle_cmd_quotaon(mp, l, args);
 		    q2type, datas);
 		break;
 	    case QUOTACTL_QUOTAOFF:
-		error = quota_handle_cmd_quotaoff(mp, l, cmddict,
+		error = quota_handle_cmd_quotaoff(mp, l, args);
 		    q2type, datas);
 		break;
 	    case QUOTACTL_GET:
-		error = quota_handle_cmd_get(mp, l, cmddict, q2type, datas);
+		error = quota_handle_cmd_get(mp, l, args);
 		break;
 	    case QUOTACTL_SET:
-		error = quota_handle_cmd_set(mp, l, cmddict, q2type, datas);
+		error = quota_handle_cmd_set(mp, l, args);
 		break;
 	    case QUOTACTL_GETALL:
-		error = quota_handle_cmd_getall(mp, l, cmddict, q2type, datas);
+		error = quota_handle_cmd_getall(mp, l, args);
 		break;
 	    case QUOTACTL_CLEAR:
-		error = quota_handle_cmd_clear(mp, l, cmddict, q2type, datas);
+		error = quota_handle_cmd_clear(mp, l, args);
 		break;
 	    default:
 		panic("Invalid quotactl operation %d\n", op);
+	}
 	return error;
+}
 static int
 quota_handle_cmd_get_version(struct mount *mp, struct lwp *l,
-    prop_dictionary_t cmddict, prop_array_t datas)
+    struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	prop_array_t replies;
 	prop_dictionary_t data;
 	int error = 0;
 	prop_dictionary_t cmddict;
 	prop_array_t datas;
 	KASSERT(args->qc_type == QCT_PROPLIB);
 	cmddict = args->u.proplib.qc_cmddict;
 	/* qc_q2type not used */
 	datas = args->u.proplib.qc_datas;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
 		return EOPNOTSUPP;
 	replies = prop_array_create();
 	if (replies == NULL)
 		return ENOMEM;
 	data = prop_dictionary_create();
 	if (data == NULL) {
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 @@ -239,35 +246,46 @@ quota_handle_cmd_get_version(struct moun
 /* XXX shouldn't all this be in kauth ? */
 static int
 quota_get_auth(struct mount *mp, struct lwp *l, uid_t id) {
 	/* The user can always query about his own quota. */
 	if (id == kauth_cred_getuid(l->l_cred))
 		return 0;
 	return kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 	    KAUTH_REQ_SYSTEM_FS_QUOTA_GET, mp, KAUTH_ARG(id), NULL);
+}
 static int
 quota_handle_cmd_get(struct mount *mp, struct lwp *l,
-    prop_dictionary_t cmddict, int type, prop_array_t datas)
+    struct vfs_quotactl_args *args)
+{
 	prop_array_t replies;
 	prop_object_iterator_t iter;
 	prop_dictionary_t data;
 	uint32_t id;
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int error, defaultq = 0;
 	const char *idstr;
 	prop_dictionary_t cmddict;
 	int q2type;
 	prop_array_t datas;
 	KASSERT(args->qc_type == QCT_PROPLIB);
 	cmddict = args->u.proplib.qc_cmddict;
 	q2type = args->u.proplib.qc_q2type;
 	datas = args->u.proplib.qc_datas;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
 		return EOPNOTSUPP;
 	replies = prop_array_create();
 	if (replies == NULL)
 		return ENOMEM;
 	iter = prop_array_iterator(datas);
 	if (iter == NULL) {
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 @@ -282,67 +300,78 @@ quota_handle_cmd_get(struct mount *mp, s
+			}
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
+		}
 		error = quota_get_auth(mp, l, id);
 		if (error == EPERM)
 			continue;
 		if (error != 0)
 			goto err;
 #ifdef QUOTA
 		if (ump->um_flags & UFS_QUOTA)
-			error = quota1_handle_cmd_get(ump, type, id, defaultq,
+			error = quota1_handle_cmd_get(ump, q2type, id, defaultq,
 			    replies);
 		else
 #endif
 #ifdef QUOTA2
 		if (ump->um_flags & UFS_QUOTA2) {
-			error = quota2_handle_cmd_get(ump, type, id, defaultq,
+			error = quota2_handle_cmd_get(ump, q2type, id, defaultq,
 			    replies);
 		} else
 #endif
 			panic("quota_handle_cmd_get: no support ?");
 		if (error == ENOENT)
 			continue;
 		if (error != 0)
 			goto err;
+	}
 	prop_object_iterator_release(iter);
 	if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
 		error = ENOMEM;
 	} else {
 		error = 0;
+	}
 	return error;
 err:
 	prop_object_iterator_release(iter);
 	prop_object_release(replies);
 	return error;
+}
 static int
 quota_handle_cmd_set(struct mount *mp, struct lwp *l,
-    prop_dictionary_t cmddict, int type, prop_array_t datas)
+    struct vfs_quotactl_args *args)
+{
 	prop_array_t replies;
 	prop_object_iterator_t iter;
 	prop_dictionary_t data;
 	uint32_t id;
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int error, defaultq = 0;
 	const char *idstr;
 	prop_dictionary_t cmddict;
 	int q2type;
 	prop_array_t datas;
 	KASSERT(args->qc_type == QCT_PROPLIB);
 	cmddict = args->u.proplib.qc_cmddict;
 	q2type = args->u.proplib.qc_q2type;
 	datas = args->u.proplib.qc_datas;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
 		return EOPNOTSUPP;
 	replies = prop_array_create();
 	if (replies == NULL)
 		return ENOMEM;
 	iter = prop_array_iterator(datas);
 	if (iter == NULL) {
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 @@ -354,65 +383,76 @@ quota_handle_cmd_set(struct mount *mp, s
 			if (strcmp(idstr, "default"))
 				continue;
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
+		}
 		error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 		    KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE, mp, KAUTH_ARG(id), NULL);
 		if (error != 0)
 			goto err;
 #ifdef QUOTA
 		if (ump->um_flags & UFS_QUOTA)
-			error = quota1_handle_cmd_set(ump, type, id, defaultq,
+			error = quota1_handle_cmd_set(ump, q2type, id, defaultq,
 			    data);
 		else
 #endif
 #ifdef QUOTA2
 		if (ump->um_flags & UFS_QUOTA2) {
-			error = quota2_handle_cmd_set(ump, type, id, defaultq,
+			error = quota2_handle_cmd_set(ump, q2type, id, defaultq,
 			    data);
 		} else
 #endif
 			panic("quota_handle_cmd_get: no support ?");
 		if (error && error != ENOENT)
 			goto err;
+	}
 	prop_object_iterator_release(iter);
 	if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
 		error = ENOMEM;
 	} else {
 		error = 0;
+	}
 	return error;
 err:
 	prop_object_iterator_release(iter);
 	prop_object_release(replies);
 	return error;
+}
 static int
 quota_handle_cmd_clear(struct mount *mp, struct lwp *l,
-    prop_dictionary_t cmddict, int type, prop_array_t datas)
+    struct vfs_quotactl_args *args)
+{
 	prop_array_t replies;
 	prop_object_iterator_t iter;
 	prop_dictionary_t data;
 	uint32_t id;
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int error, defaultq = 0;
 	const char *idstr;
 	prop_dictionary_t cmddict;
 	int q2type;
 	prop_array_t datas;
 	KASSERT(args->qc_type == QCT_PROPLIB);
 	cmddict = args->u.proplib.qc_cmddict;
 	q2type = args->u.proplib.qc_q2type;
 	datas = args->u.proplib.qc_datas;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	if ((ump->um_flags & UFS_QUOTA2) == 0)
 		return EOPNOTSUPP;
 	replies = prop_array_create();
 	if (replies == NULL)
 		return ENOMEM;
 	iter = prop_array_iterator(datas);
 	if (iter == NULL) {
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 @@ -424,138 +464,171 @@ quota_handle_cmd_clear(struct mount *mp,
 			if (strcmp(idstr, "default"))
 				continue;
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
+		}
 		error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 		    KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE, mp, KAUTH_ARG(id), NULL);
 		if (error != 0)
 			goto err;
 #ifdef QUOTA2
 		if (ump->um_flags & UFS_QUOTA2) {
-			error = quota2_handle_cmd_clear(ump, type, id, defaultq,
+			error = quota2_handle_cmd_clear(ump, q2type, id, defaultq,
 			    data);
 		} else
 #endif
 			panic("quota_handle_cmd_get: no support ?");
 		if (error && error != ENOENT)
 			goto err;
+	}
 	prop_object_iterator_release(iter);
 	if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
 		error = ENOMEM;
 	} else {
 		error = 0;
+	}
 	return error;
 err:
 	prop_object_iterator_release(iter);
 	prop_object_release(replies);
 	return error;
+}
 static int
 quota_handle_cmd_getall(struct mount *mp, struct lwp *l,
-    prop_dictionary_t cmddict, int type, prop_array_t datas)
+    struct vfs_quotactl_args *args)
+{
 	prop_array_t replies;
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int error;
 	prop_dictionary_t cmddict;
 	int q2type;
 	prop_array_t datas;
 	KASSERT(args->qc_type == QCT_PROPLIB);
 	cmddict = args->u.proplib.qc_cmddict;
 	q2type = args->u.proplib.qc_q2type;
 	datas = args->u.proplib.qc_datas;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	if ((ump->um_flags & UFS_QUOTA2) == 0)
 		return EOPNOTSUPP;
 	error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 	    KAUTH_REQ_SYSTEM_FS_QUOTA_GET, mp, NULL, NULL);
 	if (error)
 		return error;
 	replies = prop_array_create();
 	if (replies == NULL)
 		return ENOMEM;
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
-		error = quota2_handle_cmd_getall(ump, type, replies);
+		error = quota2_handle_cmd_getall(ump, q2type, replies);
 	} else
 #endif
 		panic("quota_handle_cmd_getall: no support ?");
 	if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
 		error = ENOMEM;
 	} else {
 		error = 0;
+	}
 	return error;
+}
 static int
 quota_handle_cmd_quotaon(struct mount *mp, struct lwp *l,
-    prop_dictionary_t cmddict, int type, prop_array_t datas)
+    struct vfs_quotactl_args *args)
+{
 	prop_dictionary_t data;
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int error;
 	const char *qfile;
 	prop_dictionary_t cmddict;
 	int q2type;
 	prop_array_t datas;
 	KASSERT(args->qc_type == QCT_PROPLIB);
 	cmddict = args->u.proplib.qc_cmddict;
 	q2type = args->u.proplib.qc_q2type;
 	datas = args->u.proplib.qc_datas;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	if ((ump->um_flags & UFS_QUOTA2) != 0)
 		return EBUSY;
 	if (prop_array_count(datas) != 1)
 		return EINVAL;
 	data = prop_array_get(datas, 0);
 	if (data == NULL)
 		return ENOMEM;
 	if (!prop_dictionary_get_cstring_nocopy(data, "quotafile",
 	    &qfile))
 		return EINVAL;
 	error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 	    KAUTH_REQ_SYSTEM_FS_QUOTA_ONOFF, mp, NULL, NULL);
 	if (error != 0) {
 		return error;
+	}
 #ifdef QUOTA
-	error = quota1_handle_cmd_quotaon(l, ump, type, qfile);
+	error = quota1_handle_cmd_quotaon(l, ump, q2type, qfile);
 #else
 	error = EOPNOTSUPP;
 #endif
 	return error;
+}
 static int
 quota_handle_cmd_quotaoff(struct mount *mp, struct lwp *l,
-    prop_dictionary_t cmddict, int type, prop_array_t datas)
+    struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int error;
 	prop_dictionary_t cmddict;
 	int q2type;
 	prop_array_t datas;
 	KASSERT(args->qc_type == QCT_PROPLIB);
 	cmddict = args->u.proplib.qc_cmddict;
 	q2type = args->u.proplib.qc_q2type;
 	datas = args->u.proplib.qc_datas;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	if ((ump->um_flags & UFS_QUOTA2) != 0)
 		return EOPNOTSUPP;
 	if (prop_array_count(datas) != 0)
 		return EINVAL;
 	error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 	    KAUTH_REQ_SYSTEM_FS_QUOTA_ONOFF, mp, NULL, NULL);
 	if (error != 0) {
 		return error;
+	}
 #ifdef QUOTA
-	error = quota1_handle_cmd_quotaoff(l, ump, type);
+	error = quota1_handle_cmd_quotaoff(l, ump, q2type);
 #else
 	error = EOPNOTSUPP;
 #endif
 	return error;
+}
 /*
  * Initialize the quota system.
  */
 void
 dqinit(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_vfsops.c,v 1.45 2012/01/29 06:34:58 dholland Exp $	*/
+/*	$NetBSD: ufs_vfsops.c,v 1.46 2012/01/29 06:36:07 dholland Exp $	*/
 /*
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,44 +27,45 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs_vfsops.c	8.8 (Berkeley) 5/20/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.45 2012/01/29 06:34:58 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.46 2012/01/29 06:36:07 dholland Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/kmem.h>
 #include <sys/kauth.h>
 #include <miscfs/specfs/specdev.h>
 #include <sys/quotactl.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
 #ifdef UFS_DIRHASH
 #include <ufs/ufs/dirhash.h>
 #endif
 #include <quota/quotaprop.h>
 /* how many times ufs_init() was called */
 static int ufs_initcount = 0;
 pool_cache_t ufs_direct_cache;
 @@ -90,50 +91,47 @@ ufs_root(struct mount *mp, struct vnode
 	struct vnode *nvp;
 	int error;
 	if ((error = VFS_VGET(mp, (ino_t)ROOTINO, &nvp)) != 0)
 		return (error);
 	*vpp = nvp;
 	return (0);
+}
 /*
  * Do operations associated with quotas
  */
 int
-ufs_quotactl(struct mount *mp, int op, prop_dictionary_t cmddict, int q2type,
+ufs_quotactl(struct mount *mp, int op, struct vfs_quotactl_args *args)
 	     prop_array_t datas)
+{
 	struct lwp *l = curlwp;
 #if !defined(QUOTA) && !defined(QUOTA2)
 	(void) mp;
 	(void) cmddict;
 	(void) dummy;
 	(void) l;
 	return (EOPNOTSUPP);
 #else
-	int  error;
+	int error;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	/* Mark the mount busy, as we're passing it to kauth(9). */
 	error = vfs_busy(mp, NULL);
 	if (error) {
 		return (error);
+	}
 	mutex_enter(&mp->mnt_updating);
-	error = quota_handle_cmd(mp, l, op, cmddict, q2type, datas);
+	error = quota_handle_cmd(mp, l, op, args);
 	mutex_exit(&mp->mnt_updating);
 	vfs_unbusy(mp, false, NULL);
 	return (error);
 #endif
+}
 #if 0
 	switch (cmd) {
 	case Q_SYNC:
 		break;
 	case Q_GETQUOTA: