 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_quotactl.c,v 1.28 2012/01/29 07:08:58 dholland Exp $	*/
+/*	$NetBSD: vfs_quotactl.c,v 1.29 2012/01/29 07:09:52 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.28 2012/01/29 07:08:58 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.29 2012/01/29 07:09:52 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;
 @@ -550,34 +550,34 @@ vfs_quotactl_getall(struct mount *mp,
 	keys = malloc(loopmax * sizeof(keys[0]), M_TEMP, M_WAITOK);
 	vals = malloc(loopmax * sizeof(vals[0]), M_TEMP, M_WAITOK);
 	replies = prop_array_create();
 	if (replies == NULL) {
 		error = ENOMEM;
 		goto err;
+	}
 	thisreply = NULL;
 	lastid = 0; /* value not actually referenced */
 	while (1) {
-		args.qc_type = QCT_GETALL;
+		args.qc_type = QCT_CURSORGET;
-		args.u.getall.qc_cursor = &cursor;
+		args.u.cursorget.qc_cursor = &cursor;
-		args.u.getall.qc_keys = keys;
+		args.u.cursorget.qc_keys = keys;
-		args.u.getall.qc_vals = vals;
+		args.u.cursorget.qc_vals = vals;
-		args.u.getall.qc_maxnum = loopmax;
+		args.u.cursorget.qc_maxnum = loopmax;
-		args.u.getall.qc_ret = &loopnum;
+		args.u.cursorget.qc_ret = &loopnum;
-		error = VFS_QUOTACTL(mp, QUOTACTL_GETALL, &args);
+		error = VFS_QUOTACTL(mp, QUOTACTL_CURSORGET, &args);
 		if (error) {
 			goto err;
+		}
 		if (loopnum == 0) {
 			/* end of iteration */
 			break;
+		}
 		for (i = 0; i < loopnum; i++) {
 			key = &keys[i];
 			val = &vals[i];

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quotactl.h,v 1.25 2012/01/29 07:08:58 dholland Exp $	*/
+/*	$NetBSD: quotactl.h,v 1.26 2012/01/29 07:09:52 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
 @@ -47,41 +47,47 @@
 struct quotakcursor {
 	union {
 		char qkc_space[64];
 		uintmax_t __qkc_forcealign;
 	} u;
 };
 /* Command codes. */
 #define QUOTACTL_GETVERSION	0
 #define QUOTACTL_QUOTAON	1
 #define QUOTACTL_QUOTAOFF	2
 #define QUOTACTL_GET		3
 #define QUOTACTL_PUT		4
-#define QUOTACTL_GETALL		5
+#define QUOTACTL_CURSORGET	5
 #define QUOTACTL_DELETE		6
 #define QUOTACTL_CURSOROPEN	7
 #define QUOTACTL_CURSORCLOSE	8
 #define QUOTACTL_CURSORSKIPIDTYPE 9
 #define QUOTACTL_CURSORATEND	10
 #define QUOTACTL_CURSORREWIND	11
 /* Argument encoding. */
 enum vfs_quotactl_argtypes {
 	QCT_PROPLIB,	/* quotaon/off */
 	QCT_GETVERSION,	/* getversion */
 	QCT_GET,	/* get */
 	QCT_PUT,	/* put */
 	QCT_DELETE,	/* delete */
 	QCT_CURSOROPEN,	/* open cursor */
 	QCT_CURSORCLOSE,/* close cursor */
-	QCT_GETALL,	/* get all */
+	QCT_CURSORGET,	/* get from cursor */
 	QCT_CURSORSKIPIDTYPE, /* iteration hint */
 	QCT_CURSORATEND,/* test cursor */
 	QCT_CURSORREWIND,/* reset cursor */
 };
 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;
 		struct {
 			int *qc_version_ret;
 		} getversion;
 		struct {
 @@ -93,22 +99,33 @@ struct vfs_quotactl_args {
 			const struct quotaval *qc_val;
 		} put;
 		struct {
 			const struct quotakey *qc_key;
 		} delete;
 		struct {
 			struct quotakcursor *qc_cursor;
 		} cursoropen;
 		struct {
 			struct quotakcursor *qc_cursor;
 		} cursorclose;
 		struct {
 			struct quotakcursor *qc_cursor;
 			unsigned qc_idtype;
 		} cursorskipidtype;
 		struct {
 			struct quotakcursor *qc_cursor;
 			struct quotakey *qc_keys;
 			struct quotaval *qc_vals;
 			unsigned qc_maxnum;
 			unsigned *qc_ret;
-		} getall;
+		} cursorget;
 		struct {
 			struct quotakcursor *qc_cursor;
 			int *qc_ret; /* really boolean */
 		} cursoratend;
 		struct {
 			struct quotakcursor *qc_cursor;
 		} cursorrewind;
 	} u;
 };
 #endif /* _SYS_QUOTACTL_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.c,v 1.97 2012/01/29 07:08:58 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.c,v 1.98 2012/01/29 07:09:52 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.97 2012/01/29 07:08:58 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.98 2012/01/29 07:09:52 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>
 @@ -67,38 +67,44 @@ kcondvar_t dqcv;
 #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 *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_get(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_put(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
-static int quota_handle_cmd_getall(struct mount *, struct lwp *,
+static int quota_handle_cmd_cursorget(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_delete(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_quotaon(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_quotaoff(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_cursoropen(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_cursorclose(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_cursorskipidtype(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_cursoratend(struct mount *, struct lwp *,
     struct vfs_quotactl_args *args);
 static int quota_handle_cmd_cursorrewind(struct mount *, struct lwp *,
     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;
+}
 @@ -169,38 +175,47 @@ quota_handle_cmd(struct mount *mp, struc
 		break;
 	    case QUOTACTL_QUOTAON:
 		error = quota_handle_cmd_quotaon(mp, l, args);
 		break;
 	    case QUOTACTL_QUOTAOFF:
 		error = quota_handle_cmd_quotaoff(mp, l, args);
 		break;
 	    case QUOTACTL_GET:
 		error = quota_handle_cmd_get(mp, l, args);
 		break;
 	    case QUOTACTL_PUT:
 		error = quota_handle_cmd_put(mp, l, args);
 		break;
-	    case QUOTACTL_GETALL:
+	    case QUOTACTL_CURSORGET:
-		error = quota_handle_cmd_getall(mp, l, args);
+		error = quota_handle_cmd_cursorget(mp, l, args);
 		break;
 	    case QUOTACTL_DELETE:
 		error = quota_handle_cmd_delete(mp, l, args);
 		break;
 	    case QUOTACTL_CURSOROPEN:
 		error = quota_handle_cmd_cursoropen(mp, l, args);
 		break;
 	    case QUOTACTL_CURSORCLOSE:
 		error = quota_handle_cmd_cursorclose(mp, l, args);
 		break;
 	    case QUOTACTL_CURSORSKIPIDTYPE:
 		error = quota_handle_cmd_cursorskipidtype(mp, l, args);
 		break;
 	    case QUOTACTL_CURSORATEND:
 		error = quota_handle_cmd_cursoratend(mp, l, args);
 		break;
 	    case QUOTACTL_CURSORREWIND:
 		error = quota_handle_cmd_cursorrewind(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,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int *version_ret;
 @@ -355,59 +370,59 @@ quota_handle_cmd_delete(struct mount *mp
 #endif
 			panic("quota_handle_cmd_get: no support ?");
 		if (error && error != ENOENT)
 			goto err;
+	}
 	return 0;
  err:
 	return error;
+}
 static int
-quota_handle_cmd_getall(struct mount *mp, struct lwp *l,
+quota_handle_cmd_cursorget(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	struct quotakcursor *cursor;
 	struct quotakey *keys;
 	struct quotaval *vals;
 	unsigned maxnum;
 	unsigned *ret;
 	int error;
-	KASSERT(args->qc_type == QCT_GETALL);
+	KASSERT(args->qc_type == QCT_CURSORGET);
-	cursor = args->u.getall.qc_cursor;
+	cursor = args->u.cursorget.qc_cursor;
-	keys = args->u.getall.qc_keys;
+	keys = args->u.cursorget.qc_keys;
-	vals = args->u.getall.qc_vals;
+	vals = args->u.cursorget.qc_vals;
-	maxnum = args->u.getall.qc_maxnum;
+	maxnum = args->u.cursorget.qc_maxnum;
-	ret = args->u.getall.qc_ret;
+	ret = args->u.cursorget.qc_ret;
 	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;
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
-		error = quota2_handle_cmd_getall(ump, cursor,
+		error = quota2_handle_cmd_cursorget(ump, cursor, keys, vals,
-						 keys, vals, maxnum, ret);
+						    maxnum, ret);
 	} else
 #endif
-		panic("quota_handle_cmd_getall: no support ?");
+		panic("quota_handle_cmd_cursorget: no support ?");
 	return error;
+}
 static int
 quota_handle_cmd_cursoropen(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	struct quotakcursor *cursor;
 	int error;
 	KASSERT(args->qc_type == QCT_CURSOROPEN);
 @@ -445,26 +460,93 @@ quota_handle_cmd_cursorclose(struct moun
 		return error;
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
 		error = quota2_handle_cmd_cursorclose(ump, cursor);
 	} else
 #endif
 		error = EOPNOTSUPP;
 	return error;
+}
 static int
 quota_handle_cmd_cursorskipidtype(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	struct quotakcursor *cursor;
 	int idtype;
 	int error;
 	KASSERT(args->qc_type == QCT_CURSORSKIPIDTYPE);
 	cursor = args->u.cursorskipidtype.qc_cursor;
 	idtype = args->u.cursorskipidtype.qc_idtype;
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
 		error = quota2_handle_cmd_cursorskipidtype(ump, cursor, idtype);
 	} else
 #endif
 		error = EOPNOTSUPP;
 	return error;
+}
 static int
 quota_handle_cmd_cursoratend(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	struct quotakcursor *cursor;
 	int *ret;
 	int error;
 	KASSERT(args->qc_type == QCT_CURSORATEND);
 	cursor = args->u.cursoratend.qc_cursor;
 	ret = args->u.cursoratend.qc_ret;
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
 		error = quota2_handle_cmd_cursoratend(ump, cursor, ret);
 	} else
 #endif
 		error = EOPNOTSUPP;
 	return error;
+}
 static int
 quota_handle_cmd_cursorrewind(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	struct quotakcursor *cursor;
 	int error;
 	KASSERT(args->qc_type == QCT_CURSORREWIND);
 	cursor = args->u.cursorrewind.qc_cursor;
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
 		error = quota2_handle_cmd_cursorrewind(ump, cursor);
 	} else
 #endif
 		error = EOPNOTSUPP;
 	return error;
+}
 static int
 quota_handle_cmd_quotaon(struct mount *mp, struct lwp *l,
     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;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.h,v 1.19 2012/01/29 07:08:58 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.h,v 1.20 2012/01/29 07:09:52 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.
 @@ -121,20 +121,25 @@ int quota1_handle_cmd_get(struct ufsmoun
 int quota1_handle_cmd_put(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_put(struct ufsmount *, const struct quotakey *,
     const struct quotaval *);
 int quota2_handle_cmd_delete(struct ufsmount *, const struct quotakey *);
-int quota2_handle_cmd_getall(struct ufsmount *, struct quotakcursor *,
+int quota2_handle_cmd_cursorget(struct ufsmount *, struct quotakcursor *,
     struct quotakey *, struct quotaval *, unsigned, unsigned *);
 int quota2_handle_cmd_cursoropen(struct ufsmount *, struct quotakcursor *);
 int quota2_handle_cmd_cursorclose(struct ufsmount *, struct quotakcursor *);
 int quota2_handle_cmd_cursorskipidtype(struct ufsmount *, struct quotakcursor *,
     int);
 int quota2_handle_cmd_cursoratend(struct ufsmount *, struct quotakcursor *,
     int *);
 int quota2_handle_cmd_cursorrewind(struct ufsmount *, struct quotakcursor *);
 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_quota2.c,v 1.25 2012/01/29 07:08:58 dholland Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.26 2012/01/29 07:09:52 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.25 2012/01/29 07:08:58 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.26 2012/01/29 07:09:52 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>
 @@ -1040,27 +1040,27 @@ quota2_getuids_callback(struct ufsmount
 		gu->uids = newuids;
 		gu->maxuids = newmax;
+	}
 	gu->uids[gu->nuids] = ufs_rw32(q2ep->q2e_uid, needswap);
 	gu->nuids++;
 	gu->seen++;
 	if (gu->nuids == gu->limit) {
 		return Q2WL_ABORT;
+	}
 	return 0;
+}
 int
-quota2_handle_cmd_getall(struct ufsmount *ump, struct quotakcursor *qkc,
+quota2_handle_cmd_cursorget(struct ufsmount *ump, struct quotakcursor *qkc,
     struct quotakey *keys, struct quotaval *vals, unsigned maxreturn,
     unsigned *ret)
+{
 	int error;
 	struct ufsq2_cursor *cursor;
 	struct quota2_header *q2h;
 	struct quota2_entry  q2e;
 	struct buf *hbp;
 	uint64_t offset;
 	int idtype;
 	int can_switch_idtype;
 	int i, j;
 	int quota2_hash_size;
 @@ -1270,26 +1270,94 @@ quota2_handle_cmd_cursorclose(struct ufs
 	cursor = Q2CURSOR(qkc);
 	error = q2cursor_check(cursor);
 	if (error) {
 		return error;
+	}
 	/* nothing to do */
 	return 0;
+}
 int
 quota2_handle_cmd_cursorskipidtype(struct ufsmount *ump,
     struct quotakcursor *qkc, int idtype)
+{
 	struct ufsq2_cursor *cursor;
 	int error;
 	cursor = Q2CURSOR(qkc);
 	error = q2cursor_check(cursor);
 	if (error) {
 		return error;
+	}
 	switch (idtype) {
 	    case QUOTA_IDTYPE_USER:
 		cursor->q2c_users_done = 1;
 		break;
 	    case QUOTA_IDTYPE_GROUP:
 		cursor->q2c_groups_done = 1;
 		break;
 	    default:
 		return EINVAL;
+	}
 	return 0;
+}
 int
 quota2_handle_cmd_cursoratend(struct ufsmount *ump, struct quotakcursor *qkc,
     int *ret)
+{
 	struct ufsq2_cursor *cursor;
 	int error;
 	cursor = Q2CURSOR(qkc);
 	error = q2cursor_check(cursor);
 	if (error) {
 		return error;
+	}
 	*ret = (cursor->q2c_users_done && cursor->q2c_groups_done);
 	return 0;
+}
 int
 quota2_handle_cmd_cursorrewind(struct ufsmount *ump, struct quotakcursor *qkc)
+{
 	struct ufsq2_cursor *cursor;
 	int error;
 	cursor = Q2CURSOR(qkc);
 	error = q2cursor_check(cursor);
 	if (error) {
 		return error;
+	}
 	cursor->q2c_hashsize = 0;
 	cursor->q2c_users_done = 0;
 	cursor->q2c_groups_done = 0;
 	cursor->q2c_defaults_done = 0;
 	cursor->q2c_hashpos = 0;
 	cursor->q2c_uidpos = 0;
 	cursor->q2c_blocks_done = 0;
 	return 0;
+}
 int
 q2sync(struct mount *mp)
+{
 	return 0;
+}
 struct dq2get_callback {
 	uid_t id;
 	struct dquot *dq;
 };
 static int
 dq2get_callback(struct ufsmount *ump, uint64_t *offp, struct quota2_entry *q2e,
     uint64_t off, void *v)