 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_quotactl.c,v 1.24 2012/01/29 07:05:12 dholland Exp $	*/
+/*	$NetBSD: vfs_quotactl.c,v 1.25 2012/01/29 07:06:01 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.24 2012/01/29 07:05:12 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.25 2012/01/29 07:06:01 dholland Exp $");
 #include <sys/malloc.h> /* XXX: temporary */
 #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;
 @@ -502,26 +502,28 @@ err:
+}
 static int
 vfs_quotactl_getall(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct quotakcursor cursor;
 	struct quota_getall_result result;
 	struct vfs_quotactl_args args;
 	prop_array_t replies;
 	prop_dictionary_t dict;
 	unsigned i;
 	id_t id;
 	int defaultq;
 	int error, error2;
 	int skip = 0;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	args.qc_type = QCT_CURSOROPEN;
 	args.u.cursoropen.qc_cursor = &cursor;
 	error = VFS_QUOTACTL(mp, QUOTACTL_CURSOROPEN, &args);
 	if (error) {
 		return error;
+	}
 	result.qr_keys = NULL;
 @@ -549,35 +551,35 @@ vfs_quotactl_getall(struct mount *mp,
 		goto err;
+	}
 	replies = prop_array_create();
 	if (replies == NULL) {
 		error = ENOMEM;
 		goto err;
+	}
 	if (skip) {
 		goto skip;
+	}
 	dict = vfs_quotactl_getall_makereply(0, 1, &result.qr_defblocks,
 					     &result.qr_deffiles);
 	if (!prop_array_add_and_rel(replies, dict)) {
 		error = ENOMEM;
 		goto err;
 	for (i = 0; i < result.qr_num; i += 2) {
-		dict = vfs_quotactl_getall_makereply(result.qr_keys[i].qk_id,0,
+		id = result.qr_keys[i].qk_id;
 		if (id == QUOTA_DEFAULTID) {
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
+		}
 		dict = vfs_quotactl_getall_makereply(id, defaultq,
 						     &result.qr_vals[i],
 						     &result.qr_vals[i+1]);
 		if (dict == NULL) {
 			error = ENOMEM;
 			goto err;
+		}
 		if (!prop_array_add_and_rel(replies, dict)) {
 			error = ENOMEM;
 			goto err;
+		}
+	}
 skip:

 @@ -1,14 +1,14 @@
-/* $NetBSD: ufs_quota2.c,v 1.21 2012/01/29 07:05:12 dholland Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.22 2012/01/29 07:06:02 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.21 2012/01/29 07:05:12 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.22 2012/01/29 07:06:02 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>
 @@ -1045,139 +1045,178 @@ quota2_handle_cmd_getall(struct ufsmount
     int idtype, struct quota_getall_result *result)
+{
 	int error;
 	struct ufsq2_cursor *cursor;
 	struct quota2_header *q2h;
 	struct quota2_entry  q2e;
 	struct buf *hbp;
 	uint64_t offset;
 	int i, j;
 	int quota2_hash_size;
 	const int needswap = UFS_MPNEEDSWAP(ump);
 	struct getuids gu;
 	id_t junkid;
-	struct quotaval qv;
+	struct quotakey bkey, fkey;
 	struct quotaval bval, fval;
 	int dobval = 0, dofval = 0;
 	unsigned num, maxnum;
 	int skipfirst, skiplast;
 	int maxreturn, numreturn;
 	cursor = Q2CURSOR(qkc);
 	error = q2cursor_check(cursor);
 	if (error) {
 		return error;
+	}
 	if (ump->um_quotas[idtype] == NULLVP) {
 		return ENODEV;
+	}
 	maxreturn = result->qr_max;
 	numreturn = 0;
 	mutex_enter(&dqlock);
 	error = getq2h(ump, idtype, &hbp, &q2h, 0);
 	if (error) {
 		mutex_exit(&dqlock);
 		return error;
+	}
 	if (cursor->q2c_defaults_done == 0) {
 		quota2_ufs_rwq2e(&q2h->q2h_defentry, &q2e, needswap);
 		if (cursor->q2c_blocks_done == 0) {
-			q2e_to_quotaval(&q2e, 1, &junkid, QL_BLOCK, &qv);
+			q2e_to_quotaval(&q2e, 1, &junkid, QL_BLOCK, &bval);
-			result->qr_defblocks = qv;
+			bkey.qk_idtype = idtype;
 			bkey.qk_id = QUOTA_DEFAULTID;
 			bkey.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
 			dobval = 1;
 			cursor->q2c_blocks_done = 1;
+		}
 		if (cursor->q2c_blocks_done == 1) {
-			q2e_to_quotaval(&q2e, 1, &junkid, QL_FILE, &qv);
+			q2e_to_quotaval(&q2e, 1, &junkid, QL_FILE, &fval);
-			result->qr_deffiles = qv;
+			fkey.qk_idtype = idtype;
 			fkey.qk_id = QUOTA_DEFAULTID;
 			fkey.qk_objtype = QUOTA_OBJTYPE_FILES;
 			dofval = 1;
 			cursor->q2c_blocks_done = 0;
 			cursor->q2c_defaults_done = 1;
+		}
+	}
 	/*
 	 * we can't directly get entries as we can't walk the list
 	 * with qdlock and grab dq_interlock to read the entries
 	 * at the same time. So just walk the lists to build a list of uid,
 	 * and then read entries for these uids
 	 */
 	memset(&gu, 0, sizeof(gu));
 	quota2_hash_size = ufs_rw16(q2h->q2h_hash_size, needswap);
 	/* if the table size has changed, make the caller start over */
 	if (cursor->q2c_hashsize == 0) {
 		cursor->q2c_hashsize = quota2_hash_size;
 	} else if (cursor->q2c_hashsize != quota2_hash_size) {
 		error = EDEADLK;
 		goto fail;
+	}
 	gu.skip = cursor->q2c_uidpos;
 	gu.seen = 0;
-	gu.limit = result->qr_max / 2;
+	gu.limit = (maxreturn - numreturn) / 2;
-	if (gu.limit == 0 && result->qr_max > 0) {
+	if (gu.limit == 0 && (maxreturn - numreturn) > 0) {
 		gu.limit = 1;
+	}
 	if (dobval && gu.limit > 0)
 		gu.limit--;
 	if (dofval && gu.limit > 0)
 		gu.limit--;
 	for (i = cursor->q2c_hashpos; i < quota2_hash_size ; i++) {
 		offset = q2h->q2h_entries[i];
 		gu.seen = 0;
 		error = quota2_walk_list(ump, hbp, idtype, &offset, 0, &gu,
 		    quota2_getuids_callback);
 		if (error == Q2WL_ABORT) {
 			/* got enough uids for now */
 			error = 0;
 			break;
+		}
 		if (error) {
 			if (gu.uids != NULL)
 				free(gu.uids, M_TEMP);
 			break;
+		}
+	}
 	cursor->q2c_hashpos = i;
 	cursor->q2c_uidpos = gu.seen;
 fail:
 	mutex_exit(&dqlock);
 	brelse(hbp, 0);
 	if (error)
 		return error;
 	maxnum = gu.nuids*2;
 	if (dobval)
 		maxnum++;
 	if (dofval)
 		maxnum++;
 	result->qr_keys = malloc(maxnum * sizeof(result->qr_keys[0]),
 				 M_TEMP, M_WAITOK);
 	result->qr_vals = malloc(maxnum * sizeof(result->qr_vals[0]),
 				 M_TEMP, M_WAITOK);
 	if (dobval && numreturn < maxreturn) {
 		result->qr_keys[numreturn] = bkey;
 		result->qr_vals[numreturn] = bval;
 		numreturn++;
+	}
 	if (dofval && numreturn < maxreturn) {
 		result->qr_keys[numreturn] = fkey;
 		result->qr_vals[numreturn] = fval;
 		numreturn++;
+	}
 	if (numreturn == maxreturn) {
 		return 0;
+	}
 	/*
 	 * If we've already sent back the blocks value for the first id,
 	 * don't send it again (skipfirst).
+	 *
 	 * If we have an odd number of available result slots and we
 	 * aren't going to skip the first result entry, we need to
 	 * leave off the last result entry (skiplast).
 	 */
 	skipfirst = (cursor->q2c_blocks_done != 0);
 	skiplast = skipfirst == 0 && (result->qr_max < maxnum);
 	num = 0;
 	for (j = 0; j < gu.nuids; j++) {
 		error = quota2_result_add_q2e(ump, idtype,
-		    gu.uids[j], result, j*2,
+		    gu.uids[j], result, numreturn + j*2,
 		    j == 0 && skipfirst,
 		    j + 1 == gu.nuids && skiplast);
 		if (error == ENOENT)
 			continue;
 		if (error)
 			break;
-		num += 2;
+		if ((j == 0 && skipfirst) || (j + 1 == gu.nuids && skiplast)) {
 			num += 1;
 		} else {
 			num += 2;
+		}
+	}
-	result->qr_num = num;
+	numreturn += num;
 	result->qr_num = numreturn;
 	cursor->q2c_blocks_done = skiplast;
 	free(gu.uids, M_TEMP);
 	return error;
+}
 int
 quota2_handle_cmd_cursoropen(struct ufsmount *ump, struct quotakcursor *qkc)
+{
 	struct ufsq2_cursor *cursor;
 	CTASSERT(sizeof(*cursor) <= sizeof(qkc->u.qkc_space));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quotactl.h,v 1.22 2012/01/29 07:05:12 dholland Exp $	*/
+/*	$NetBSD: quotactl.h,v 1.23 2012/01/29 07:06:01 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
 @@ -97,25 +97,23 @@ struct vfs_quotactl_args {
 		struct {
 			const struct quotakey *qc_key;
 		} delete;
 		struct {
 			struct quotakcursor *qc_cursor;
 		} cursoropen;
 		struct {
 			struct quotakcursor *qc_cursor;
 		} cursorclose;
 		struct {
 			struct quotakcursor *qc_cursor;
 			int qc_idtype;
 			struct quota_getall_result {
 				struct quotaval qr_defblocks;
 				struct quotaval qr_deffiles;
 				struct quotakey *qr_keys;
 				struct quotaval *qr_vals;
 				unsigned qr_num;
 				unsigned qr_max;
 			} *qc_result;
 		} getall;
 	} u;
 };
 #endif /* _SYS_QUOTACTL_H_ */