 @@ -1,14 +1,14 @@
-/* $NetBSD: ufs_quota2.c,v 1.19 2012/01/29 07:03:47 dholland Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.20 2012/01/29 07:04:21 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.19 2012/01/29 07:03:47 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.20 2012/01/29 07:04:21 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>
 @@ -951,90 +951,121 @@ quota2_handle_cmd_get(struct ufsmount *u
 		(void)id2;
 	} else
 		error = quota2_fetch_q2e(ump, qk, ret);
 	return error;
+}
 struct ufsq2_cursor {
 	uint32_t q2c_magic;	/* magic number */
 	int q2c_hashsize;	/* size of hash table at last go */
 	int q2c_defaults_done;	/* true if we've returned the default values */
 	int q2c_hashpos;	/* slot to start at in hash table */
 	int q2c_uidpos;		/* number of ids we've handled */
 	int q2c_blocks_done;	/* true if we've returned the blocks value */
 };
 #define Q2C_MAGIC (0xbeebe111)
 #define Q2CURSOR(qkc) ((struct ufsq2_cursor *)&qkc->u.qkc_space[0])
 static int
 q2cursor_check(struct ufsq2_cursor *cursor)
+{
 	if (cursor->q2c_magic != Q2C_MAGIC) {
 		return EINVAL;
+	}
 	if (cursor->q2c_hashsize < 0) {
 		return EINVAL;
+	}
 	if (cursor->q2c_defaults_done != 0 && cursor->q2c_defaults_done != 1) {
 		return EINVAL;
+	}
 	if (cursor->q2c_hashpos < 0 || cursor->q2c_uidpos < 0) {
 		return EINVAL;
+	}
 	if (cursor->q2c_blocks_done != 0 && cursor->q2c_blocks_done != 1) {
 		return EINVAL;
+	}
 	return 0;
+}
 struct getuids {
 	long nuids; /* number of uids in array */
 	long size;  /* size of array */
 	uid_t *uids; /* array of uids, dynamically allocated */
 	long skip;
 	long seen;
 };
 static int
 quota2_getuids_callback(struct ufsmount *ump, uint64_t *offp,
     struct quota2_entry *q2ep, uint64_t off, void *v)
+{
 	struct getuids *gu = v;
 	uid_t *newuids;
 #ifdef FFS_EI
 	const int needswap = UFS_MPNEEDSWAP(ump);
 #endif
 	if (gu->skip > 0) {
 		gu->skip--;
 		return 0;
+	}
 	if (gu->nuids == gu->size) {
 		newuids = realloc(gu->uids, gu->size + PAGE_SIZE, M_TEMP,
 		    M_WAITOK);
 		if (newuids == NULL) {
 			free(gu->uids, M_TEMP);
 			return ENOMEM;
+		}
 		gu->uids = newuids;
 		gu->size += (PAGE_SIZE / sizeof(uid_t));
+	}
 	gu->uids[gu->nuids] = ufs_rw32(q2ep->q2e_uid, needswap);
 	gu->nuids++;
 	gu->seen++;
 	return 0;
+}
 int
 quota2_handle_cmd_getall(struct ufsmount *ump, struct quotakcursor *qkc,
     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;
 	unsigned num, maxnum;
 	cursor = Q2CURSOR(qkc);
-	if (cursor->q2c_magic != Q2C_MAGIC) {
+	error = q2cursor_check(cursor);
-		return EINVAL;
+	if (error) {
 		return error;
+	}
-	if (ump->um_quotas[idtype] == NULLVP)
+	if (ump->um_quotas[idtype] == NULLVP) {
 		return ENODEV;
+	}
 	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);
 			result->qr_defblocks = qv;
 @@ -1055,43 +1086,41 @@ quota2_handle_cmd_getall(struct ufsmount
 	 * 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;
+	}
-	/* why are these variables signed? */
+	gu.skip = cursor->q2c_uidpos;
-	if (cursor->q2c_hashpos < 0) {
+	gu.seen = 0;
 		error = EINVAL;
 		goto fail;
 	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) {
 			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;
 	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);
 @@ -1111,40 +1140,44 @@ fail:
 	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));
 	cursor = Q2CURSOR(qkc);
 	cursor->q2c_magic = Q2C_MAGIC;
 	cursor->q2c_hashsize = 0;
 	cursor->q2c_hashpos = 0;
 	cursor->q2c_defaults_done = 0;
 	cursor->q2c_hashpos = 0;
 	cursor->q2c_uidpos = 0;
 	cursor->q2c_blocks_done = 0;
 	return 0;
+}
 int
 quota2_handle_cmd_cursorclose(struct ufsmount *ump, struct quotakcursor *qkc)
+{
 	struct ufsq2_cursor *cursor;
 	int error;
 	cursor = Q2CURSOR(qkc);
-	if (cursor->q2c_magic != Q2C_MAGIC) {
+	error = q2cursor_check(cursor);
-		return EINVAL;
+	if (error) {
 		return error;
+	}
 	/* nothing to do */
 	return 0;
+}
 int
 q2sync(struct mount *mp)
+{
 	return 0;
+}