 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_quotactl.c,v 1.13 2012/01/29 06:47:38 dholland Exp $	*/
+/*	$NetBSD: vfs_quotactl.c,v 1.14 2012/01/29 06:48:50 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,27 +70,27 @@
+ *
  *	@(#)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.13 2012/01/29 06:47:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.14 2012/01/29 06:48:50 dholland Exp $");
 #include <sys/mount.h>
 #include <sys/quota.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)
+{
 	prop_array_t replies;
 	prop_dictionary_t data;
 @@ -351,26 +351,27 @@ vfs_quotactl_set_extractinfo(prop_dictio
+}
 static int
 vfs_quotactl_set(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	prop_array_t replies;
 	prop_object_iterator_t iter;
 	prop_dictionary_t data;
 	int defaultq;
 	uint32_t id;
 	const char *idstr;
 	struct quotakey qk;
 	struct quotaval blocks, files;
 	struct vfs_quotactl_args args;
 	int error;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	replies = prop_array_create();
 	if (replies == NULL)
 		return ENOMEM;
 	iter = prop_array_iterator(datas);
 	if (iter == NULL) {
 @@ -389,42 +390,44 @@ vfs_quotactl_set(struct mount *mp,
 			if (strcmp(idstr, "default"))
 				continue;
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
+		}
 		error = vfs_quotactl_set_extractinfo(data, &blocks, &files);
 		if (error) {
 			goto err;
+		}
 		qk.qk_idtype = q2type;
 		qk.qk_id = defaultq ? QUOTA_DEFAULTID : id;
 		qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
 		args.qc_type = QCT_SET;
-		args.u.set.qc_idtype = q2type;
+		args.u.set.qc_key = &qk;
 		args.u.set.qc_id = id;
 		args.u.set.qc_defaultq = defaultq;
 		args.u.set.qc_objtype = QUOTA_OBJTYPE_BLOCKS;
 		args.u.set.qc_val = &blocks;
 		error = VFS_QUOTACTL(mp, QUOTACTL_SET, &args);
 		if (error) {
 			goto err;
+		}
 		qk.qk_idtype = q2type;
 		qk.qk_id = defaultq ? QUOTA_DEFAULTID : id;
 		qk.qk_objtype = QUOTA_OBJTYPE_FILES;
 		args.qc_type = QCT_SET;
-		args.u.set.qc_idtype = q2type;
+		args.u.set.qc_key = &qk;
 		args.u.set.qc_id = id;
 		args.u.set.qc_defaultq = defaultq;
 		args.u.set.qc_objtype = QUOTA_OBJTYPE_FILES;
 		args.u.set.qc_val = &files;
 		error = VFS_QUOTACTL(mp, QUOTACTL_SET, &args);
 		if (error) {
 			goto err;
+		}
+	}
 	prop_object_iterator_release(iter);
 	if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
 		error = ENOMEM;
 	} else {
 		error = 0;
+	}
 	return error;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quotactl.h,v 1.11 2012/01/29 06:47:38 dholland Exp $	*/
+/*	$NetBSD: quotactl.h,v 1.12 2012/01/29 06:48:50 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
 @@ -59,23 +59,20 @@ struct vfs_quotactl_args {
 		struct {
 			prop_dictionary_t qc_cmddict;
 			int qc_q2type;
 			prop_array_t qc_datas;
 		} proplib;
 		struct {
 			int *qc_version_ret;
 		} getversion;
 		struct {
 			const struct quotakey *qc_key;
 			struct quotaval *qc_ret;
 		} get;
 		struct {
-			int qc_idtype;
+			const struct quotakey *qc_key;
 			id_t qc_id;
 			int qc_defaultq;
 			int qc_objtype;
 			const struct quotaval *qc_val;
 		} set;
 	} u;
 };
 #endif /* _SYS_QUOTACTL_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.c,v 1.83 2012/01/29 06:47:38 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.c,v 1.84 2012/01/29 06:48:50 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.83 2012/01/29 06:47:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.84 2012/01/29 06:48:50 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>
 @@ -258,59 +258,58 @@ quota_handle_cmd_get(struct mount *mp, s
 		panic("quota_handle_cmd_get: no support ?");
 	if (error != 0)
 		return error;
 	return error;
+}
 static int
 quota_handle_cmd_set(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
-	int idtype;
+	const struct quotakey *qk;
 	id_t id;
 	int defaultq;
 	int objtype;
 	const struct quotaval *qv;
 	id_t kauth_id;
 	int error;
 	KASSERT(args->qc_type == QCT_SET);
-	idtype = args->u.set.qc_idtype;
+	qk = args->u.set.qc_key;
 	id = args->u.set.qc_id;
 	defaultq = args->u.set.qc_defaultq;
 	objtype = args->u.set.qc_objtype;
 	qv = args->u.set.qc_val;
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
 		return EOPNOTSUPP;
 	kauth_id = qk->qk_id;
 	if (kauth_id == QUOTA_DEFAULTID) {
 		kauth_id = 0;
+	}
 	/* avoid whitespace changes */
+	{
 		error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
-		    KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE, mp, KAUTH_ARG(id), NULL);
+		    KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE, mp, KAUTH_ARG(kauth_id),
 		    NULL);
 		if (error != 0)
 			goto err;
 #ifdef QUOTA
 		if (ump->um_flags & UFS_QUOTA)
-			error = quota1_handle_cmd_set(ump, idtype, id, defaultq,
+			error = quota1_handle_cmd_set(ump, qk, qv);
 			    objtype, qv);
 		else
 #endif
 #ifdef QUOTA2
 		if (ump->um_flags & UFS_QUOTA2) {
-			error = quota2_handle_cmd_set(ump, idtype, id, defaultq,
+			error = quota2_handle_cmd_set(ump, qk, qv);
 			    objtype, qv);
 		} else
 #endif
 			panic("quota_handle_cmd_get: no support ?");
 		if (error && error != ENOENT)
 			goto err;
+	}
 	return 0;
  err:
 	return error;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.h,v 1.8 2012/01/29 06:47:38 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.h,v 1.9 2012/01/29 06:48:50 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.
 @@ -105,30 +105,30 @@ const char *quotatypes[MAXQUOTAS];
 int  getinoquota(struct inode *);
 int  dqget(struct vnode *, u_long, struct ufsmount *, int, struct dquot **);
 void dqref(struct dquot *);
 void dqrele(struct vnode *, struct dquot *);
 void dqflush(struct vnode *);
 int chkdq1(struct inode *, int64_t, kauth_cred_t, int);
 int chkiq1(struct inode *, int32_t, kauth_cred_t, int);
 int q1sync(struct mount *);
 int dq1get(struct vnode *, u_long, struct ufsmount *, int, struct dquot *);
 int dq1sync(struct vnode *, struct dquot *);
 int quota1_handle_cmd_get(struct ufsmount *, const struct quotakey *,
     struct quotaval *);
-int quota1_handle_cmd_set(struct ufsmount *, int, int, int, int,
+int quota1_handle_cmd_set(struct ufsmount *, const struct quotakey *,
     const struct quotaval *);
 int quota1_handle_cmd_quotaon(struct lwp *, struct ufsmount *, int,
     const char *);
 int quota1_handle_cmd_quotaoff(struct lwp *, struct ufsmount *, int);
 int chkdq2(struct inode *, int64_t, kauth_cred_t, int);
 int chkiq2(struct inode *, int32_t, kauth_cred_t, int);
 int quota2_handle_cmd_get(struct ufsmount *, const struct quotakey *,
     struct quotaval *);
-int quota2_handle_cmd_set(struct ufsmount *, int, int, int, int,
+int quota2_handle_cmd_set(struct ufsmount *, const struct quotakey *,
     const struct quotaval *);
 int quota2_handle_cmd_clear(struct ufsmount *, int, int, int, prop_dictionary_t);
 int quota2_handle_cmd_getall(struct ufsmount *, int, prop_array_t);
 int q2sync(struct mount *);
 int dq2get(struct vnode *, u_long, struct ufsmount *, int, struct dquot *);
 int dq2sync(struct vnode *, struct dquot *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota1.c,v 1.13 2012/01/29 06:47:38 dholland Exp $	*/
+/*	$NetBSD: ufs_quota1.c,v 1.14 2012/01/29 06:48:51 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_quota1.c,v 1.13 2012/01/29 06:47:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.14 2012/01/29 06:48:51 dholland Exp $");
 #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>
 #include <quota/quotaprop.h>
 #include <ufs/ufs/quota1.h>
 @@ -543,106 +543,118 @@ quota1_handle_cmd_get(struct ufsmount *u
 	return 0;
+}
 static uint32_t
 quota1_encode_limit(uint64_t lim)
+{
 	if (lim == QUOTA_NOLIMIT || lim >= 0xffffffff) {
 		return 0;
+	}
 	return lim;
+}
 int
-quota1_handle_cmd_set(struct ufsmount *ump, int idtype, int id,
+quota1_handle_cmd_set(struct ufsmount *ump, const struct quotakey *key,
-    int defaultq, int objtype, const struct quotaval *val)
+    const struct quotaval *val)
+{
 	struct dquot *dq;
 	struct dqblk dqb;
 	int error;
-	switch (objtype) {
+	switch (key->qk_idtype) {
 	    case QUOTA_IDTYPE_USER:
 	    case QUOTA_IDTYPE_GROUP:
 		break;
 	    default:
 		return EINVAL;
+	}
 	switch (key->qk_objtype) {
 	    case QUOTA_OBJTYPE_BLOCKS:
 	    case QUOTA_OBJTYPE_FILES:
 		break;
 	    default:
 		return EINVAL;
+	}
-	if (ump->um_quotas[idtype] == NULLVP)
+	if (ump->um_quotas[key->qk_idtype] == NULLVP)
 		return ENODEV;
-	if (defaultq) {
+	if (key->qk_id == QUOTA_DEFAULTID) {
 		/* just update grace times */
-		KASSERT(id == 0);
+		id_t id = 0;
 		if ((error = dqget(NULLVP, id, ump, idtype, &dq)) != 0)
 		if ((error = dqget(NULLVP, id, ump, key->qk_idtype, &dq)) != 0)
 			return error;
 		mutex_enter(&dq->dq_interlock);
-		if (objtype == QUOTA_OBJTYPE_BLOCKS && val->qv_grace > 0)
+		if (val->qv_grace != QUOTA_NOTIME) {
-			ump->umq1_btime[idtype] = dq->dq_btime =
+			if (key->qk_objtype == QUOTA_OBJTYPE_BLOCKS)
-			    val->qv_grace;
+				ump->umq1_btime[key->qk_idtype] = dq->dq_btime =
-		if (objtype == QUOTA_OBJTYPE_FILES && val->qv_grace > 0)
+					val->qv_grace;
-			ump->umq1_itime[idtype] = dq->dq_itime =
+			if (key->qk_objtype == QUOTA_OBJTYPE_FILES)
-			    val->qv_grace;
+				ump->umq1_itime[key->qk_idtype] = dq->dq_itime =
-		mutex_exit(&dq->dq_interlock);
+					val->qv_grace;
+		}
 		dq->dq_flags |= DQ_MOD;
 		mutex_exit(&dq->dq_interlock);
 		dqrele(NULLVP, dq);
 		return 0;
+	}
-	if ((error = dqget(NULLVP, id, ump, idtype, &dq)) != 0)
+	if ((error = dqget(NULLVP, key->qk_id, ump, key->qk_idtype, &dq)) != 0)
 		return (error);
 	mutex_enter(&dq->dq_interlock);
 	/*
 	 * Copy all but the current values.
 	 * Reset time limit if previously had no soft limit or were
 	 * under it, but now have a soft limit and are over it.
 	 */
 	dqb.dqb_curblocks = dq->dq_curblocks;
 	dqb.dqb_curinodes = dq->dq_curinodes;
 	dqb.dqb_btime = dq->dq_btime;
 	dqb.dqb_itime = dq->dq_itime;
-	switch (objtype) {
+	switch (key->qk_objtype) {
 	    case QUOTA_OBJTYPE_BLOCKS:
 		dqb.dqb_bsoftlimit = quota1_encode_limit(val->qv_softlimit);
 		dqb.dqb_bhardlimit = quota1_encode_limit(val->qv_hardlimit);
 		dqb.dqb_isoftlimit = dq->dq_isoftlimit;
 		dqb.dqb_ihardlimit = dq->dq_ihardlimit;
 		break;
 	    case QUOTA_OBJTYPE_FILES:
 		dqb.dqb_bsoftlimit = dq->dq_bsoftlimit;
 		dqb.dqb_bhardlimit = dq->dq_bhardlimit;
 		dqb.dqb_isoftlimit = quota1_encode_limit(val->qv_softlimit);
 		dqb.dqb_ihardlimit = quota1_encode_limit(val->qv_hardlimit);
 		break;
+	}
 	if (dq->dq_id == 0 && val->qv_grace != QUOTA_NOTIME) {
 		/* also update grace time if available */
-		if (objtype == QUOTA_OBJTYPE_BLOCKS) {
+		if (key->qk_objtype == QUOTA_OBJTYPE_BLOCKS) {
-			ump->umq1_btime[idtype] = dqb.dqb_btime = val->qv_grace;
+			ump->umq1_btime[key->qk_idtype] = dqb.dqb_btime =
 				val->qv_grace;
+		}
-		if (objtype == QUOTA_OBJTYPE_FILES) {
+		if (key->qk_objtype == QUOTA_OBJTYPE_FILES) {
-			ump->umq1_itime[idtype] = dqb.dqb_itime = val->qv_grace;
+			ump->umq1_itime[key->qk_idtype] = dqb.dqb_itime =
 				val->qv_grace;
+		}
+	}
 	if (dqb.dqb_bsoftlimit &&
 	    dq->dq_curblocks >= dqb.dqb_bsoftlimit &&
 	    (dq->dq_bsoftlimit == 0 || dq->dq_curblocks < dq->dq_bsoftlimit))
-		dqb.dqb_btime = time_second + ump->umq1_btime[idtype];
+		dqb.dqb_btime = time_second + ump->umq1_btime[key->qk_idtype];
 	if (dqb.dqb_isoftlimit &&
 	    dq->dq_curinodes >= dqb.dqb_isoftlimit &&
 	    (dq->dq_isoftlimit == 0 || dq->dq_curinodes < dq->dq_isoftlimit))
-		dqb.dqb_itime = time_second + ump->umq1_itime[idtype];
+		dqb.dqb_itime = time_second + ump->umq1_itime[key->qk_idtype];
 	dq->dq_un.dq1_dqb = dqb;
 	if (dq->dq_curblocks < dq->dq_bsoftlimit)
 		dq->dq_flags &= ~DQ_WARN(QL_BLOCK);
 	if (dq->dq_curinodes < dq->dq_isoftlimit)
 		dq->dq_flags &= ~DQ_WARN(QL_FILE);
 	if (dq->dq_isoftlimit == 0 && dq->dq_bsoftlimit == 0 &&
 	    dq->dq_ihardlimit == 0 && dq->dq_bhardlimit == 0)
 		dq->dq_flags |= DQ_FAKE;
 	else
 		dq->dq_flags &= ~DQ_FAKE;
 	dq->dq_flags |= DQ_MOD;
 	mutex_exit(&dq->dq_interlock);
 	dqrele(NULLVP, dq);

 @@ -1,14 +1,14 @@
-/* $NetBSD: ufs_quota2.c,v 1.9 2012/01/29 06:47:38 dholland Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.10 2012/01/29 06:48:51 dholland Exp $ */
 /*-
   * Copyright (c) 2010 Manuel Bouyer
   * 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.
+  *
 @@ -16,27 +16,27 @@
   * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
   * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
   */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.9 2012/01/29 06:47:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.10 2012/01/29 06:48:51 dholland Exp $");
 #include <sys/buf.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/fstrans.h>
 #include <sys/kauth.h>
 @@ -601,76 +601,81 @@ quota2_check(struct inode *ip, int vtype
 int
 chkdq2(struct inode *ip, int64_t change, kauth_cred_t cred, int flags)
+{
 	return quota2_check(ip, QL_BLOCK, change, cred, flags);
+}
 int
 chkiq2(struct inode *ip, int32_t change, kauth_cred_t cred, int flags)
+{
 	return quota2_check(ip, QL_FILE, change, cred, flags);
+}
 int
-quota2_handle_cmd_set(struct ufsmount *ump, int type, int id,
+quota2_handle_cmd_set(struct ufsmount *ump, const struct quotakey *key,
-    int defaultq, int objtype, const struct quotaval *val)
+    const struct quotaval *val)
+{
 	int error;
 	struct dquot *dq;
 	struct quota2_header *q2h;
 	struct quota2_entry q2e, *q2ep;
 	struct buf *bp;
 	const int needswap = UFS_MPNEEDSWAP(ump);
-	if (ump->um_quotas[type] == NULLVP)
+	/* make sure we can index by the fs-independent idtype */
 	CTASSERT(QUOTA_IDTYPE_USER == USRQUOTA);
 	CTASSERT(QUOTA_IDTYPE_GROUP == GRPQUOTA);
 	if (ump->um_quotas[key->qk_idtype] == NULLVP)
 		return ENODEV;
 	error = UFS_WAPBL_BEGIN(ump->um_mountp);
 	if (error)
 		return error;
-	if (defaultq) {
+	if (key->qk_id == QUOTA_DEFAULTID) {
 		mutex_enter(&dqlock);
-		error = getq2h(ump, type, &bp, &q2h, B_MODIFY);
+		error = getq2h(ump, key->qk_idtype, &bp, &q2h, B_MODIFY);
 		if (error) {
 			mutex_exit(&dqlock);
 			goto out_wapbl;
+		}
 		quota2_ufs_rwq2e(&q2h->q2h_defentry, &q2e, needswap);
-		quota2_dict_update_q2e_limits(objtype, val, &q2e);
+		quota2_dict_update_q2e_limits(key->qk_objtype, val, &q2e);
 		quota2_ufs_rwq2e(&q2e, &q2h->q2h_defentry, needswap);
 		mutex_exit(&dqlock);
 		quota2_bwrite(ump->um_mountp, bp);
 		goto out_wapbl;
+	}
-	error = dqget(NULLVP, id, ump, type, &dq);
+	error = dqget(NULLVP, key->qk_id, ump, key->qk_idtype, &dq);
 	if (error)
 		goto out_wapbl;
 	mutex_enter(&dq->dq_interlock);
 	if (dq->dq2_lblkno == 0 && dq->dq2_blkoff == 0) {
 		/* need to alloc a new on-disk quot */
 		mutex_enter(&dqlock);
-		error = quota2_q2ealloc(ump, type, id, dq, &bp, &q2ep);
+		error = quota2_q2ealloc(ump, key->qk_idtype, key->qk_id, dq,
 		    &bp, &q2ep);
 		mutex_exit(&dqlock);
 	} else {
-		error = getq2e(ump, type, dq->dq2_lblkno, dq->dq2_blkoff,
+		error = getq2e(ump, key->qk_idtype, dq->dq2_lblkno,
-		    &bp, &q2ep, B_MODIFY);
+		    dq->dq2_blkoff, &bp, &q2ep, B_MODIFY);
+	}
 	if (error)
 		goto out_il;
 	quota2_ufs_rwq2e(q2ep, &q2e, needswap);
-	quota2_dict_update_q2e_limits(objtype, val, &q2e);
+	quota2_dict_update_q2e_limits(key->qk_objtype, val, &q2e);
 	quota2_ufs_rwq2e(&q2e, q2ep, needswap);
 	quota2_bwrite(ump->um_mountp, bp);
 out_il:
 	mutex_exit(&dq->dq_interlock);
 	dqrele(NULLVP, dq);
 out_wapbl:
 	UFS_WAPBL_END(ump->um_mountp);
 	return error;
+}
 struct dq2clear_callback {
 	uid_t id;