 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_quotactl.c,v 1.8 2012/01/29 06:39:36 dholland Exp $	*/
+/*	$NetBSD: vfs_quotactl.c,v 1.9 2012/01/29 06:40:57 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.8 2012/01/29 06:39:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.9 2012/01/29 06:40:57 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;
 @@ -231,28 +231,45 @@ vfs_quotactl_get(struct mount *mp,
 				error = EINVAL;
 				goto fail;
+			}
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
+		}
 		args.qc_type = QCT_GET;
 		args.u.get.qc_q2type = q2type;
 		args.u.get.qc_id = id;
 		args.u.get.qc_defaultq = defaultq;
-		args.u.get.qc_blocks_ret = &blocks;
+		args.u.get.qc_objtype = QUOTA_OBJTYPE_BLOCKS;
-		args.u.get.qc_files_ret = &files;
+		args.u.get.qc_ret = &blocks;
 		error = VFS_QUOTACTL(mp, QUOTACTL_GET, &args);
 		if (error == EPERM) {
 			/* XXX does this make sense? */
 			continue;
 		} else if (error == ENOENT) {
 			/* XXX does *this* make sense? */
 			continue;
 		} else if (error) {
 			goto fail;
+		}
 		args.qc_type = QCT_GET;
 		args.u.get.qc_q2type = q2type;
 		args.u.get.qc_id = id;
 		args.u.get.qc_defaultq = defaultq;
 		args.u.get.qc_objtype = QUOTA_OBJTYPE_FILES;
 		args.u.get.qc_ret = &files;
 		error = VFS_QUOTACTL(mp, QUOTACTL_GET, &args);
 		if (error == EPERM) {
 			/* XXX does this make sense? */
 			continue;
 		} else if (error == ENOENT) {
 			/* XXX does *this* make sense? */
 			continue;
 		} else if (error) {
 			goto fail;
+		}
 		error = vfs_quotactl_get_addreply(id, defaultq,
 						  &blocks, &files,

 @@ -1,14 +1,14 @@
-/* $NetBSD: quota.h,v 1.8 2012/01/29 06:38:23 dholland Exp $ */
+/* $NetBSD: quota.h,v 1.9 2012/01/29 06:40:57 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.
+  *
 @@ -20,28 +20,49 @@
   * 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.
   */
 #ifndef _SYS_QUOTA_H_
 #define _SYS_QUOTA_H_
 #include <sys/types.h>
 /* quota id types (entities being billed) */
 #define QUOTA_IDTYPE_USER	0
 #define QUOTA_IDTYPE_GROUP	1
 /* quota object types (things being limited) */
 #define QUOTA_OBJTYPE_BLOCKS	0
 #define QUOTA_OBJTYPE_FILES	1
 /* id value for "default" */
 #define QUOTA_DEFAULTID		((id_t)-1)
 /* limit value for "no limit" */
 #define QUOTA_NOLIMIT		((uint64_t)0xffffffffffffffffULL)
 /* time value for "no time" */
 #define QUOTA_NOTIME		((time_t)-1)
 struct quotakey {
 	int qk_idtype;
 	id_t qk_id;
 	int qk_objtype;
 };
 /*
  * Structure used to describe the value part of a quota record.
  */
 struct quotaval {
         uint64_t qv_hardlimit;	/* absolute limit */
 	uint64_t qv_softlimit;	/* overflowable limit */
 	uint64_t qv_usage;	/* current usage */
 	time_t qv_expiretime;	/* time when softlimit grace expires */
 	time_t qv_grace;	/* allowed time for overflowing soft limit */
 };
 #endif /* _SYS_QUOTA_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.c,v 1.76 2012/01/29 06:39:37 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.c,v 1.77 2012/01/29 06:40:57 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.76 2012/01/29 06:39:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.77 2012/01/29 06:40:57 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>
 @@ -225,52 +225,53 @@ quota_get_auth(struct mount *mp, struct
 	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,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int error;
 	id_t id;
 	int q2type;
 	int defaultq;
-	struct quotaval *blocks, *files;
+	int objtype;
 	struct quotaval *ret;
 	KASSERT(args->qc_type == QCT_GET);
 	id = args->u.get.qc_id;
 	q2type = args->u.get.qc_q2type;
 	defaultq = args->u.get.qc_defaultq;
-	blocks = args->u.get.qc_blocks_ret;
+	objtype = args->u.get.qc_objtype;
-	files = args->u.get.qc_files_ret;
+	ret = args->u.get.qc_ret;
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
 		return EOPNOTSUPP;
 	/* avoid whitespace diffs */ {
 		error = quota_get_auth(mp, l, id);
 		if (error != 0)
 			return error;
 #ifdef QUOTA
 		if (ump->um_flags & UFS_QUOTA) {
 			error = quota1_handle_cmd_get(ump, q2type, id, defaultq,
-			    blocks, files);
+			    objtype, ret);
 		} else
 #endif
 #ifdef QUOTA2
 		if (ump->um_flags & UFS_QUOTA2) {
 			error = quota2_handle_cmd_get(ump, q2type, id, defaultq,
-			    blocks, files);
+			    objtype, ret);
 		} else
 #endif
 			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,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.h,v 1.3 2012/01/29 06:38:24 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.h,v 1.4 2012/01/29 06:40:57 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.
 @@ -103,30 +103,30 @@ extern kcondvar_t dqcv;
 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 *, int, int, int,
+int quota1_handle_cmd_get(struct ufsmount *, int, int, int, int,
-    struct quotaval *, struct quotaval *);
+    struct quotaval *);
 int quota1_handle_cmd_set(struct ufsmount *, int, int, int, prop_dictionary_t);
 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 *, int, int, int,
+int quota2_handle_cmd_get(struct ufsmount *, int, int, int, int,
-    struct quotaval *, struct quotaval *);
+    struct quotaval *);
 int quota2_handle_cmd_set(struct ufsmount *, int, int, int, prop_dictionary_t);
 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.8 2012/01/29 06:38:24 dholland Exp $	*/
+/*	$NetBSD: ufs_quota1.c,v 1.9 2012/01/29 06:40:57 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.8 2012/01/29 06:38:24 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.9 2012/01/29 06:40:57 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>
 @@ -484,58 +484,67 @@ again:
 		if (ump->um_quotas[i] != NULLVP)
 			break;
 	ump->umq1_qflags[type] &= ~QTF_CLOSING;
 	cv_broadcast(&dqcv);
 	mutex_exit(&dqlock);
 	kauth_cred_free(cred);
 	if (i == MAXQUOTAS)
 		mp->mnt_flag &= ~MNT_QUOTA;
 	return (error);
+}
 int
 quota1_handle_cmd_get(struct ufsmount *ump, int idtype, int id,
-    int defaultq, struct quotaval *blocks, struct quotaval *files)
+    int defaultq, int objtype, struct quotaval *ret)
+{
 	struct dquot *dq;
 	int error;
-	uint64_t *valuesp[QUOTA_NLIMITS];
+	struct quotaval blocks, files;
 	valuesp[QUOTA_LIMIT_BLOCK] = &blocks->qv_hardlimit;
 	valuesp[QUOTA_LIMIT_FILE] = &files->qv_hardlimit;
 	if (ump->um_quotas[idtype] == NULLVP)
 		return ENODEV;
 	if (defaultq) { /* we want the grace period of id 0 */
 		if ((error = dqget(NULLVP, 0, ump, idtype, &dq)) != 0)
 			return error;
 	} else {
 		if ((error = dqget(NULLVP, id, ump, idtype, &dq)) != 0)
 			return error;
+	}
-	dqblk_to_quotavals(&dq->dq_un.dq1_dqb, blocks, files);
+	dqblk_to_quotavals(&dq->dq_un.dq1_dqb, &blocks, &files);
 	dqrele(NULLVP, dq);
 	if (defaultq) {
-		if (blocks->qv_expiretime > 0)
+		if (blocks.qv_expiretime > 0)
-			blocks->qv_grace = blocks->qv_expiretime;
+			blocks.qv_grace = blocks.qv_expiretime;
 		else
-			blocks->qv_grace = MAX_DQ_TIME;
+			blocks.qv_grace = MAX_DQ_TIME;
-		if (files->qv_expiretime > 0)
+		if (files.qv_expiretime > 0)
-			files->qv_grace = files->qv_expiretime;
+			files.qv_grace = files.qv_expiretime;
 		else
-			files->qv_grace = MAX_DQ_TIME;
+			files.qv_grace = MAX_DQ_TIME;
+	}
 	switch (objtype) {
 	    case QUOTA_OBJTYPE_BLOCKS:
 		*ret = blocks;
 		break;
 	    case QUOTA_OBJTYPE_FILES:
 		*ret = files;
 		break;
 	    default:
 		return EINVAL;
+	}
 	return 0;
+}
 int
 quota1_handle_cmd_set(struct ufsmount *ump, int type, int id,
     int defaultq, prop_dictionary_t data)
+{
 	struct dquot *dq;
 	struct dqblk dqb;
 	int error;
 	uint64_t bval[2];
 	uint64_t ival[2];
 	const char *val_limitsonly_grace[] = {QUOTADICT_LIMIT_GTIME};

 @@ -1,14 +1,14 @@
-/* $NetBSD: ufs_quota2.c,v 1.5 2012/01/29 06:38:24 dholland Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.6 2012/01/29 06:40:58 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.5 2012/01/29 06:38:24 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.6 2012/01/29 06:40:58 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>
 @@ -67,28 +67,26 @@ static int getinoquota2(struct inode *,
     struct quota2_entry **);
 static int getq2h(struct ufsmount *, int, struct buf **,
     struct quota2_header **, int);
 static int getq2e(struct ufsmount *, int, daddr_t, int, struct buf **,
     struct quota2_entry **, int);
 static int quota2_walk_list(struct ufsmount *, struct buf *, int,
     uint64_t *, int, void *,
     int (*func)(struct ufsmount *, uint64_t *, struct quota2_entry *,
       uint64_t, void *));
 static int quota2_dict_update_q2e_limits(prop_dictionary_t,
     struct quota2_entry *);
 static prop_dictionary_t q2etoprop(struct quota2_entry *, int);
 static void q2e_to_quotavals(struct quota2_entry *, int, id_t *,
     struct quotaval *, struct quotaval *);
 static const char *limnames[] = INITQLNAMES;
 static int
 quota2_dict_update_q2e_limits(prop_dictionary_t data,
     struct quota2_entry *q2e)
+{
 	const char *val_limitsonly_names[] = INITQVNAMES_LIMITSONLY;
 	int i, error;
 	prop_dictionary_t val;
 	for (i = 0; i < N_QL; i++) {
 @@ -149,38 +147,37 @@ q2val_to_quotaval(struct quota2_val *q2v
+{
 	qv->qv_softlimit = q2v->q2v_softlimit;
 	qv->qv_hardlimit = q2v->q2v_hardlimit;
 	qv->qv_usage = q2v->q2v_cur;
 	qv->qv_expiretime = q2v->q2v_time;
 	qv->qv_grace = q2v->q2v_grace;
+}
 /*
  * Convert a quota2entry and default-flag to the FS-independent
  * representation.
  */
 static void
-q2e_to_quotavals(struct quota2_entry *q2e, int def,
+q2e_to_quotaval(struct quota2_entry *q2e, int def,
-	       id_t *id, struct quotaval *blocks, struct quotaval *files)
+	       id_t *id, int objtype, struct quotaval *ret)
+{
 	if (def) {
 		*id = QUOTA_DEFAULTID;
 	} else {
 		*id = q2e->q2e_uid;
+	}
-	CTASSERT(N_QL == 2);
+	KASSERT(objtype >= 0 && objtype < N_QL);
-	q2val_to_quotaval(&q2e->q2e_val[QL_BLOCK], blocks);
+	q2val_to_quotaval(&q2e->q2e_val[objtype], ret);
 	q2val_to_quotaval(&q2e->q2e_val[QL_FILE], files);
+}
 static int
 quota2_bwrite(struct mount *mp, struct buf *bp)
+{
 	if (mp->mnt_flag & MNT_SYNCHRONOUS)
 		return bwrite(bp);
 	else {
 		bdwrite(bp);
 		return 0;
+	}
+}
 @@ -847,27 +844,27 @@ quota2_array_add_q2e(struct ufsmount *um
 	mutex_exit(&dq->dq_interlock);
 	dqrele(NULLVP, dq);
 	dict = q2etoprop(&q2e, 0);
 	if (dict == NULL)
 		return ENOMEM;
 	if (!prop_array_add_and_rel(replies, dict))
 		return ENOMEM;
 	return 0;
+}
 static int
 quota2_fetch_q2e(struct ufsmount *ump, int type,
-    int id, struct quotaval *blocks, struct quotaval *files)
+    int id, int objtype, struct quotaval *ret)
+{
 	struct dquot *dq;
 	int error;
 	struct quota2_entry *q2ep, q2e;
 	struct buf  *bp;
 	const int needswap = UFS_MPNEEDSWAP(ump);
 	id_t id2;
 	error = dqget(NULLVP, id, ump, type, &dq);
 	if (error)
 		return error;
 	mutex_enter(&dq->dq_interlock);
 @@ -878,58 +875,71 @@ quota2_fetch_q2e(struct ufsmount *ump, i
+	}
 	error = getq2e(ump, type, dq->dq2_lblkno, dq->dq2_blkoff,
 	    &bp, &q2ep, 0);
 	if (error) {
 		mutex_exit(&dq->dq_interlock);
 		dqrele(NULLVP, dq);
 		return error;
+	}
 	quota2_ufs_rwq2e(q2ep, &q2e, needswap);
 	brelse(bp, 0);
 	mutex_exit(&dq->dq_interlock);
 	dqrele(NULLVP, dq);
-	q2e_to_quotavals(&q2e, 0, &id2, blocks, files);
+	q2e_to_quotaval(&q2e, 0, &id2, objtype, ret);
 	KASSERT(id2 == id);
 	return 0;
+}
 int
 quota2_handle_cmd_get(struct ufsmount *ump, int type, int id,
-    int defaultq, struct quotaval *blocks, struct quotaval *files)
+    int defaultq, int objtype, struct quotaval *ret)
+{
 	int error;
 	struct quota2_header *q2h;
 	struct quota2_entry q2e;
 	struct buf *bp;
 	const int needswap = UFS_MPNEEDSWAP(ump);
 	id_t id2;
 	/*
 	 * Make sure the FS-independent codes match the internal ones,
 	 * so we can use the passed-in objtype without having to
 	 * convert it explicitly to QL_BLOCK/QL_FILE.
 	 */
 	CTASSERT(QL_BLOCK == QUOTA_OBJTYPE_BLOCKS);
 	CTASSERT(QL_FILE == QUOTA_OBJTYPE_FILES);
 	CTASSERT(N_QL == 2);
 	if (objtype < 0 || objtype >= N_QL) {
 		return EINVAL;
+	}
 	if (ump->um_quotas[type] == NULLVP)
 		return ENODEV;
 	if (defaultq) {
 		mutex_enter(&dqlock);
 		error = getq2h(ump, type, &bp, &q2h, 0);
 		if (error) {
 			mutex_exit(&dqlock);
 			return error;
+		}
 		quota2_ufs_rwq2e(&q2h->q2h_defentry, &q2e, needswap);
 		mutex_exit(&dqlock);
 		brelse(bp, 0);
-		q2e_to_quotavals(&q2e, defaultq, &id2, blocks, files);
+		q2e_to_quotaval(&q2e, defaultq, &id2, objtype, ret);
 		(void)id2;
 	} else
-		error = quota2_fetch_q2e(ump, type, id, blocks, files);
+		error = quota2_fetch_q2e(ump, type, id, objtype, ret);
 	return error;
+}
 struct getuids {
 	long nuids; /* number of uids in array */
 	long size;  /* size of array */
 	uid_t *uids; /* array of uids, dynamically allocated */
 };
 static int
 quota2_getuids_callback(struct ufsmount *ump, uint64_t *offp,
     struct quota2_entry *q2ep, uint64_t off, void *v)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quotactl.h,v 1.6 2012/01/29 06:39:36 dholland Exp $	*/
+/*	$NetBSD: quotactl.h,v 1.7 2012/01/29 06:40:57 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
 @@ -57,20 +57,20 @@ struct vfs_quotactl_args {
 	union {
 		struct {
 			prop_dictionary_t qc_cmddict;
 			int qc_q2type;
 			prop_array_t qc_datas;
 		} proplib;
 		struct {
 			int *qc_version_ret;
 		} getversion;
 		struct {
 			int qc_q2type;
 			id_t qc_id;
 			int qc_defaultq;
-			struct quotaval *qc_blocks_ret;
+			int qc_objtype;
-			struct quotaval *qc_files_ret;
+			struct quotaval *qc_ret;
 		} get;
 	} u;
 };
 #endif /* _SYS_QUOTACTL_H_ */