 @@ -1,889 +1,893 @@
-/*	$NetBSD: vfs_quotactl.c,v 1.31 2012/01/29 07:11:12 dholland Exp $	*/
+/*	$NetBSD: vfs_quotactl.c,v 1.32 2012/01/29 07:11:55 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:
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 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_vfsops.c	8.8 (Berkeley) 5/20/95
  *	From NetBSD: ufs_vfsops.c,v 1.42 2011/03/24 17:05:46 bouyer 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.
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 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
  *	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.31 2012/01/29 07:11:12 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.32 2012/01/29 07:11:55 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;
 	prop_dictionary_t data;
 	int q2version;
 	struct vfs_quotactl_args args;
 	int error;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	args.qc_type = QCT_GETVERSION;
 	args.u.getversion.qc_version_ret = &q2version;
 	error = VFS_QUOTACTL(mp, QUOTACTL_GETVERSION, &args);
 	if (error) {
 		return error;
+	}
 	data = prop_dictionary_create();
 	if (data == NULL) {
 		return ENOMEM;
+	}
 	if (!prop_dictionary_set_int8(data, "version", q2version)) {
 		prop_object_release(data);
 		return ENOMEM;
+	}
 	replies = prop_array_create();
 	if (replies == NULL) {
 		prop_object_release(data);
 		return ENOMEM;
+	}
 	if (!prop_array_add_and_rel(replies, data)) {
 		prop_object_release(data);
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 	if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 	return error;
+}
 static int
 vfs_quotactl_quotaon(struct mount *mp,
 		     prop_dictionary_t cmddict, int q2type,
 		     prop_array_t datas)
+{
 	prop_dictionary_t data;
 	const char *qfile;
 	struct vfs_quotactl_args args;
 	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
 	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	if (prop_array_count(datas) != 1)
 		return EINVAL;
 	data = prop_array_get(datas, 0);
 	if (data == NULL)
 		return ENOMEM;
 	if (!prop_dictionary_get_cstring_nocopy(data, "quotafile",
 	    &qfile))
 		return EINVAL;
 	args.qc_type = QCT_QUOTAON;
 	args.u.quotaon.qc_idtype = q2type;
 	args.u.quotaon.qc_quotafile = qfile;
 	return VFS_QUOTACTL(mp, QUOTACTL_QUOTAON, &args);
+}
 static int
 vfs_quotactl_quotaoff(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct vfs_quotactl_args args;
-	args.qc_type = QCT_PROPLIB;
+	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
-	args.u.proplib.qc_cmddict = cmddict;
+	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
 	args.u.proplib.qc_q2type = q2type;
-	args.u.proplib.qc_datas = datas;
+	if (prop_array_count(datas) != 0)
 		return EINVAL;
 	args.qc_type = QCT_QUOTAOFF;
 	args.u.quotaoff.qc_idtype = q2type;
 	return VFS_QUOTACTL(mp, QUOTACTL_QUOTAOFF, &args);
+}
 static int
 vfs_quotactl_get_addreply(const struct quotakey *qk,
 			  const struct quotaval *blocks,
 			  const struct quotaval *files,
 			  prop_array_t replies)
+{
 	prop_dictionary_t dict;
 	id_t id;
 	int defaultq;
 	uint64_t *valuesp[QUOTA_NLIMITS];
 	/* XXX illegal casts */
 	valuesp[QUOTA_LIMIT_BLOCK] = (void *)(intptr_t)&blocks->qv_hardlimit;
 	valuesp[QUOTA_LIMIT_FILE] =  (void *)(intptr_t)&files->qv_hardlimit;
 	if (qk->qk_id == QUOTA_DEFAULTID) {
 		id = 0;
 		defaultq = 1;
 	} else {
 		id = qk->qk_id;
 		defaultq = 0;
+	}
 	dict = quota64toprop(id, defaultq, valuesp,
 	    ufs_quota_entry_names, UFS_QUOTA_NENTRIES,
 	    ufs_quota_limit_names, QUOTA_NLIMITS);
 	if (dict == NULL)
 		return ENOMEM;
 	if (!prop_array_add_and_rel(replies, dict)) {
 		prop_object_release(dict);
 		return ENOMEM;
+	}
 	return 0;
+}
 static int
 vfs_quotactl_get(struct mount *mp,
 			prop_dictionary_t cmddict, int idtype,
 			prop_array_t datas)
+{
 	prop_object_iterator_t iter;
 	prop_dictionary_t data;
 	prop_array_t replies;
 	uint32_t id;
 	const char *idstr;
 	struct vfs_quotactl_args args;
 	struct quotakey qk;
 	struct quotaval blocks, files;
 	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) {
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 	while ((data = prop_object_iterator_next(iter)) != NULL) {
 		qk.qk_idtype = idtype;
 		if (!prop_dictionary_get_uint32(data, "id", &id)) {
 			if (!prop_dictionary_get_cstring_nocopy(data, "id",
 			    &idstr))
 				continue;
 			if (strcmp(idstr, "default")) {
 				error = EINVAL;
 				goto fail;
+			}
 			qk.qk_id = QUOTA_DEFAULTID;
 		} else {
 			qk.qk_id = id;
+		}
 		qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
 		args.qc_type = QCT_GET;
 		args.u.get.qc_key = &qk;
 		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;
+		}
 		qk.qk_objtype = QUOTA_OBJTYPE_FILES;
 		args.qc_type = QCT_GET;
 		args.u.get.qc_key = &qk;
 		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(&qk, &blocks, &files,
 						  replies);
+	}
 	prop_object_iterator_release(iter);
 	if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
 		error = ENOMEM;
 	} else {
 		error = 0;
+	}
 	return error;
  fail:
 	prop_object_iterator_release(iter);
 	prop_object_release(replies);
 	return error;
+}
 static int
 vfs_quotactl_put_extractinfo(prop_dictionary_t data,
 			struct quotaval *blocks, struct quotaval *files)
+{
 	/*
 	 * So, the way proptoquota64 works is that you pass it an
 	 * array of pointers to uint64. Each of these pointers is
 	 * supposed to point to 5 (UFS_QUOTA_NENTRIES) uint64s. This
 	 * array of pointers is the second argument. The third and
 	 * forth argument are the names of the five values to extract,
 	 * and UFS_QUOTA_NENTRIES. The last two arguments are the
 	 * names assocated with the pointers (QUOTATYPE_LDICT_BLOCK,
 	 * QUOTADICT_LTYPE_FILE) and the number of pointers. Most of
 	 * the existing code was unsafely casting struct quotaval
 	 * (formerly struct ufs_quota_entry) to (uint64_t *) and using
 	 * that as the block of 5 uint64s. Or worse, pointing to
 	 * subregions of that and reducing the number of uint64s to
 	 * pull "adjacent" values. Demons fly out of your nose!
 	 */
 	uint64_t bvals[UFS_QUOTA_NENTRIES];
 	uint64_t fvals[UFS_QUOTA_NENTRIES];
 	uint64_t *valptrs[QUOTA_NLIMITS];
 	int error;
 	valptrs[QUOTA_LIMIT_BLOCK] = bvals;
 	valptrs[QUOTA_LIMIT_FILE] = fvals;
 	error = proptoquota64(data, valptrs,
 			      ufs_quota_entry_names, UFS_QUOTA_NENTRIES,
 			      ufs_quota_limit_names, QUOTA_NLIMITS);
 	if (error) {
 		return error;
+	}
 	/*
 	 * There are no symbolic constants for these indexes!
 	 */
 	blocks->qv_hardlimit = bvals[0];
 	blocks->qv_softlimit = bvals[1];
 	blocks->qv_usage = bvals[2];
 	blocks->qv_expiretime = bvals[3];
 	blocks->qv_grace = bvals[4];
 	files->qv_hardlimit = fvals[0];
 	files->qv_softlimit = fvals[1];
 	files->qv_usage = fvals[2];
 	files->qv_expiretime = fvals[3];
 	files->qv_grace = fvals[4];
 	return 0;
+}
 static int
 vfs_quotactl_put(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) {
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 	while ((data = prop_object_iterator_next(iter)) != NULL) {
 		KASSERT(prop_object_type(data) == PROP_TYPE_DICTIONARY);
 		if (!prop_dictionary_get_uint32(data, "id", &id)) {
 			if (!prop_dictionary_get_cstring_nocopy(data, "id",
 			    &idstr))
 				continue;
 			if (strcmp(idstr, "default"))
 				continue;
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
+		}
 		error = vfs_quotactl_put_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_PUT;
 		args.u.put.qc_key = &qk;
 		args.u.put.qc_val = &blocks;
 		error = VFS_QUOTACTL(mp, QUOTACTL_PUT, &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_PUT;
 		args.u.put.qc_key = &qk;
 		args.u.put.qc_val = &files;
 		error = VFS_QUOTACTL(mp, QUOTACTL_PUT, &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;
 err:
 	prop_object_iterator_release(iter);
 	prop_object_release(replies);
 	return error;
+}
 static prop_dictionary_t
 vfs_quotactl_getall_makereply(const struct quotakey *key)
+{
 	prop_dictionary_t dict;
 	id_t id;
 	int defaultq;
 	dict = prop_dictionary_create();
 	if (dict == NULL)
 		return NULL;
 	id = key->qk_id;
 	if (id == QUOTA_DEFAULTID) {
 		id = 0;
 		defaultq = 1;
 	} else {
 		defaultq = 0;
+	}
 	if (defaultq) {
 		if (!prop_dictionary_set_cstring_nocopy(dict, "id",
 		    "default")) {
 			goto err;
+		}
 	} else {
 		if (!prop_dictionary_set_uint32(dict, "id", id)) {
 			goto err;
+		}
+	}
 	return dict;
 err:
 	prop_object_release(dict);
 	return NULL;
+}
 static int
 vfs_quotactl_getall_addreply(prop_dictionary_t thisreply,
     const struct quotakey *key, const struct quotaval *val)
+{
 #define INITQVNAMES_ALL { \
     QUOTADICT_LIMIT_HARD, \
     QUOTADICT_LIMIT_SOFT, \
     QUOTADICT_LIMIT_USAGE, \
     QUOTADICT_LIMIT_ETIME, \
     QUOTADICT_LIMIT_GTIME \
+    }
 #define N_QV 5
 	const char *val_names[] = INITQVNAMES_ALL;
 	uint64_t vals[N_QV];
 	prop_dictionary_t dict2;
 	const char *objtypename;
 	switch (key->qk_objtype) {
 	    case QUOTA_OBJTYPE_BLOCKS:
 		objtypename = QUOTADICT_LTYPE_BLOCK;
 		break;
 	    case QUOTA_OBJTYPE_FILES:
 		objtypename = QUOTADICT_LTYPE_FILE;
 		break;
 	    default:
 		return EINVAL;
+	}
 	vals[0] = val->qv_hardlimit;
 	vals[1] = val->qv_softlimit;
 	vals[2] = val->qv_usage;
 	vals[3] = val->qv_expiretime;
 	vals[4] = val->qv_grace;
 	dict2 = limits64toprop(vals, val_names, N_QV);
 	if (dict2 == NULL)
 		return ENOMEM;
 	if (!prop_dictionary_set_and_rel(thisreply, objtypename, dict2))
 		return ENOMEM;
 	return 0;
+}
 static int
 vfs_quotactl_getall(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct quotakcursor cursor;
 	struct quotakey *keys;
 	struct quotaval *vals;
 	unsigned loopmax = 8;
 	unsigned loopnum;
 	int skipidtype;
 	struct vfs_quotactl_args args;
 	prop_array_t replies;
 	int atend, atzero;
 	struct quotakey *key;
 	struct quotaval *val;
 	id_t lastid;
 	prop_dictionary_t thisreply;
 	unsigned i;
 	int error, error2;
 	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;
+	}
 	keys = malloc(loopmax * sizeof(keys[0]), M_TEMP, M_WAITOK);
 	vals = malloc(loopmax * sizeof(vals[0]), M_TEMP, M_WAITOK);
 	skipidtype = (q2type == QUOTA_IDTYPE_USER ?
 		      QUOTA_IDTYPE_GROUP : QUOTA_IDTYPE_USER);
 	args.qc_type = QCT_CURSORSKIPIDTYPE;
 	args.u.cursorskipidtype.qc_cursor = &cursor;
 	args.u.cursorskipidtype.qc_idtype = skipidtype;
 	error = VFS_QUOTACTL(mp, QUOTACTL_CURSORSKIPIDTYPE, &args);
 	/* ignore if it fails */
 	(void)error;
 	replies = prop_array_create();
 	if (replies == NULL) {
 		error = ENOMEM;
 		goto err;
+	}
 	thisreply = NULL;
 	lastid = 0; /* value not actually referenced */
 	atzero = 0;
 	while (1) {
 		args.qc_type = QCT_CURSORATEND;
 		args.u.cursoratend.qc_cursor = &cursor;
 		args.u.cursoratend.qc_ret = &atend;
 		error = VFS_QUOTACTL(mp, QUOTACTL_CURSORATEND, &args);
 		if (error) {
 			goto err;
+		}
 		if (atend) {
 			break;
+		}
 		args.qc_type = QCT_CURSORGET;
 		args.u.cursorget.qc_cursor = &cursor;
 		args.u.cursorget.qc_keys = keys;
 		args.u.cursorget.qc_vals = vals;
 		args.u.cursorget.qc_maxnum = loopmax;
 		args.u.cursorget.qc_ret = &loopnum;
 		error = VFS_QUOTACTL(mp, QUOTACTL_CURSORGET, &args);
 		if (error == EDEADLK) {
 			/*
 			 * transaction abort, start over
 			 */
 			args.qc_type = QCT_CURSORREWIND;
 			args.u.cursorrewind.qc_cursor = &cursor;
 			error = VFS_QUOTACTL(mp, QUOTACTL_CURSORREWIND, &args);
 			if (error) {
 				goto err;
+			}
 			args.qc_type = QCT_CURSORSKIPIDTYPE;
 			args.u.cursorskipidtype.qc_cursor = &cursor;
 			args.u.cursorskipidtype.qc_idtype = skipidtype;
 			error = VFS_QUOTACTL(mp, QUOTACTL_CURSORSKIPIDTYPE,
 					     &args);
 			/* ignore if it fails */
 			(void)error;
 			prop_object_release(replies);
 			replies = prop_array_create();
 			if (replies == NULL) {
 				error = ENOMEM;
 				goto err;
+			}
 			thisreply = NULL;
 			lastid = 0;
 			atzero = 0;
 			continue;
+		}
 		if (error) {
 			goto err;
+		}
 		if (loopnum == 0) {
 			/*
 			 * This is not supposed to happen. However,
 			 * allow a return of zero items once as long
 			 * as something happens (including an atend
 			 * indication) on the next pass. If it happens
 			 * twice, warn and assume end of iteration.
 			 */
 			if (atzero) {
 				printf("vfs_quotactl: zero items returned\n");
 				break;
+			}
 			atzero = 1;
 		} else {
 			atzero = 0;
+		}
 		for (i = 0; i < loopnum; i++) {
 			key = &keys[i];
 			val = &vals[i];
 			if (key->qk_idtype != q2type) {
 				/* don't want this result */
 				continue;
+			}
 			if (thisreply == NULL || key->qk_id != lastid) {
 				lastid = key->qk_id;
 				thisreply = vfs_quotactl_getall_makereply(key);
 				if (thisreply == NULL) {
 					error = ENOMEM;
 					goto err;
+				}
 				/*
 				 * Note: while we release our reference to
 				 * thisreply here, we can (and do) continue to
 				 * use the pointer in the loop because the
 				 * copy attached to the replies array is not
 				 * going away.
 				 */
 				if (!prop_array_add_and_rel(replies,
 							    thisreply)) {
 					error = ENOMEM;
 					goto err;
+				}
+			}
 			error = vfs_quotactl_getall_addreply(thisreply,
 							     key, val);
 			if (error) {
 				goto err;
+			}
+		}
+	}
 	if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
 		replies = NULL;
 		error = ENOMEM;
 		goto err;
+	}
 	replies = NULL;
 	error = 0;
  err:
 	free(keys, M_TEMP);
 	free(vals, M_TEMP);
 	if (replies != NULL) {
 		prop_object_release(replies);
+	}
 	args.qc_type = QCT_CURSORCLOSE;
 	args.u.cursorclose.qc_cursor = &cursor;
 	error2 = VFS_QUOTACTL(mp, QUOTACTL_CURSORCLOSE, &args);
 	if (error) {
 		return error;
+	}
 	error = error2;
 	return error;
+}
 static int
 vfs_quotactl_clear(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;
 	uint32_t id;
 	int defaultq;
 	const char *idstr;
 	struct quotakey qk;
 	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) {
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 	while ((data = prop_object_iterator_next(iter)) != NULL) {
 		if (!prop_dictionary_get_uint32(data, "id", &id)) {
 			if (!prop_dictionary_get_cstring_nocopy(data, "id",
 			    &idstr))
 				continue;
 			if (strcmp(idstr, "default"))
 				continue;
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
+		}
 		qk.qk_idtype = q2type;
 		qk.qk_id = defaultq ? QUOTA_DEFAULTID : id;
 		qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
 		args.qc_type = QCT_DELETE;
 		args.u.delete.qc_key = &qk;
 		error = VFS_QUOTACTL(mp, QUOTACTL_DELETE, &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_DELETE;
 		args.u.delete.qc_key = &qk;
 		error = VFS_QUOTACTL(mp, QUOTACTL_DELETE, &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;
 err:
 	prop_object_iterator_release(iter);
 	prop_object_release(replies);
 	return error;
+}
 static int
 vfs_quotactl_cmd(struct mount *mp, prop_dictionary_t cmddict)
+{
 	int error;
 	const char *cmd, *type;
 	prop_array_t datas;
 	int q2type;
 	if (!prop_dictionary_get_cstring_nocopy(cmddict, "command", &cmd))
 		return EINVAL;
 	if (!prop_dictionary_get_cstring_nocopy(cmddict, "type", &type))
 		return EINVAL;
 	if (!strcmp(type, QUOTADICT_CLASS_USER)) {
 		q2type = QUOTA_CLASS_USER;
 	} else if (!strcmp(type, QUOTADICT_CLASS_GROUP)) {
 		q2type = QUOTA_CLASS_GROUP;
 	} else {
 		/* XXX this is a bad errno for this case */
 		return EOPNOTSUPP;
+	}
 	datas = prop_dictionary_get(cmddict, "data");
 	if (datas == NULL || prop_object_type(datas) != PROP_TYPE_ARRAY)
 		return EINVAL;
 	prop_object_retain(datas);
 	prop_dictionary_remove(cmddict, "data"); /* prepare for return */
 	if (strcmp(cmd, "get version") == 0) {
 		error = vfs_quotactl_getversion(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "quotaon") == 0) {
 		error = vfs_quotactl_quotaon(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "quotaoff") == 0) {
 		error = vfs_quotactl_quotaoff(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "get") == 0) {
 		error = vfs_quotactl_get(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "set") == 0) {
 		error = vfs_quotactl_put(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "getall") == 0) {
 		error = vfs_quotactl_getall(mp, cmddict, q2type, datas);
 	} else if (strcmp(cmd, "clear") == 0) {
 		error = vfs_quotactl_clear(mp, cmddict, q2type, datas);
 	} else {
 		/* XXX this a bad errno for this case */
 		error = EOPNOTSUPP;
+	}
 	error = (prop_dictionary_set_int8(cmddict, "return",
 	    error) ? 0 : ENOMEM);
 	prop_object_release(datas);
 	return error;
+}
 int
 vfs_quotactl(struct mount *mp, prop_dictionary_t dict)
+{
 	prop_dictionary_t cmddict;
 	prop_array_t commands;
 	prop_object_iterator_t iter;
 	int error;
 	error = quota_get_cmds(dict, &commands);
 	if (error) {
 		return error;
+	}
 	iter = prop_array_iterator(commands);
 	if (iter == NULL) {
 		return ENOMEM;
+	}
 	while ((cmddict = prop_object_iterator_next(iter)) != NULL) {
 		if (prop_object_type(cmddict) != PROP_TYPE_DICTIONARY) {
 			/* XXX shouldn't this be an error? */
 			continue;
+		}
 		error = vfs_quotactl_cmd(mp, cmddict);
 		if (error) {
 			break;
+		}
+	}
 	prop_object_iterator_release(iter);
 	return error;
+}

 @@ -1,905 +1,895 @@
-/*	$NetBSD: ufs_quota.c,v 1.99 2012/01/29 07:11:12 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.c,v 1.100 2012/01/29 07:11:55 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.
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 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.99 2012/01/29 07:11:12 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.100 2012/01/29 07:11:55 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>
 #include <sys/quotactl.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
 #include <ufs/ufs/ufs_quota.h>
 #include <quota/quotaprop.h>
 kmutex_t dqlock;
 kcondvar_t dqcv;
 /*
  * Code pertaining to management of the in-core dquot data structures.
  */
 #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_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;
+}
 /*
  * Release the quota fields from an inode.
  */
 void
 ufsquota_free(struct inode *ip)
+{
 	int i;
 	for (i = 0; i < MAXQUOTAS; i++) {
 		dqrele(ITOV(ip), ip->i_dquot[i]);
 		ip->i_dquot[i] = NODQUOT;
+	}
+}
 /*
  * Update disk usage, and take corrective action.
  */
 int
 chkdq(struct inode *ip, int64_t change, kauth_cred_t cred, int flags)
+{
 	/* do not track snapshot usage, or we will deadlock */
 	if ((ip->i_flags & SF_SNAPSHOT) != 0)
 		return 0;
 #ifdef QUOTA
 	if (ip->i_ump->um_flags & UFS_QUOTA)
 		return chkdq1(ip, change, cred, flags);
 #endif
 #ifdef QUOTA2
 	if (ip->i_ump->um_flags & UFS_QUOTA2)
 		return chkdq2(ip, change, cred, flags);
 #endif
 	return 0;
+}
 /*
  * Check the inode limit, applying corrective action.
  */
 int
 chkiq(struct inode *ip, int32_t change, kauth_cred_t cred, int flags)
+{
 	/* do not track snapshot usage, or we will deadlock */
 	if ((ip->i_flags & SF_SNAPSHOT) != 0)
 		return 0;
 #ifdef QUOTA
 	if (ip->i_ump->um_flags & UFS_QUOTA)
 		return chkiq1(ip, change, cred, flags);
 #endif
 #ifdef QUOTA2
 	if (ip->i_ump->um_flags & UFS_QUOTA2)
 		return chkiq2(ip, change, cred, flags);
 #endif
 	return 0;
+}
 int
 quota_handle_cmd(struct mount *mp, struct lwp *l, int op,
 		 struct vfs_quotactl_args *args)
+{
 	int error = 0;
 	switch (op) {
 	    case QUOTACTL_GETVERSION:
 		error = quota_handle_cmd_get_version(mp, l, args);
 		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_CURSORGET:
 		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;
 	KASSERT(args->qc_type == QCT_GETVERSION);
 	version_ret = args->u.getversion.qc_version_ret;
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
 		return EOPNOTSUPP;
 #ifdef QUOTA
 	if (ump->um_flags & UFS_QUOTA) {
 		*version_ret = 1;
 	} else
 #endif
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
 		*version_ret = 2;
 	} else
 #endif
 		return EOPNOTSUPP;
 	return 0;
+}
 /* XXX shouldn't all this be in kauth ? */
 static int
 quota_get_auth(struct mount *mp, struct lwp *l, uid_t id) {
 	/* The user can always query about his own quota. */
 	if (id == kauth_cred_getuid(l->l_cred))
 		return 0;
 	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;
 	const struct quotakey *qk;
 	struct quotaval *ret;
 	KASSERT(args->qc_type == QCT_GET);
 	qk = args->u.get.qc_key;
 	ret = args->u.get.qc_ret;
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
 		return EOPNOTSUPP;
 	error = quota_get_auth(mp, l, qk->qk_id);
 	if (error != 0)
 		return error;
 #ifdef QUOTA
 	if (ump->um_flags & UFS_QUOTA) {
 		error = quota1_handle_cmd_get(ump, qk, ret);
 	} else
 #endif
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
 		error = quota2_handle_cmd_get(ump, qk, ret);
 	} else
 #endif
 		panic("quota_handle_cmd_get: no support ?");
 	if (error != 0)
 		return error;
 	return error;
+}
 static int
 quota_handle_cmd_put(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	const struct quotakey *qk;
 	const struct quotaval *qv;
 	id_t kauth_id;
 	int error;
 	KASSERT(args->qc_type == QCT_PUT);
 	qk = args->u.put.qc_key;
 	qv = args->u.put.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;
+	}
 	error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 	    KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE, mp, KAUTH_ARG(kauth_id),
 	    NULL);
 	if (error != 0) {
 		return error;
+	}
 #ifdef QUOTA
 	if (ump->um_flags & UFS_QUOTA)
 		error = quota1_handle_cmd_put(ump, qk, qv);
 	else
 #endif
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
 		error = quota2_handle_cmd_put(ump, qk, qv);
 	} else
 #endif
 		panic("quota_handle_cmd_get: no support ?");
 	if (error == ENOENT) {
 		error = 0;
+	}
 	return error;
+}
 static int
 quota_handle_cmd_delete(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	const struct quotakey *qk;
 	id_t kauth_id;
 	int error;
 	KASSERT(args->qc_type == QCT_DELETE);
 	qk = args->u.delete.qc_key;
 	kauth_id = qk->qk_id;
 	if (kauth_id == QUOTA_DEFAULTID) {
 		kauth_id = 0;
+	}
 	if ((ump->um_flags & UFS_QUOTA2) == 0)
 		return EOPNOTSUPP;
 	/* avoid whitespace changes */
+	{
 		error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 		    KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE, mp, KAUTH_ARG(kauth_id),
 		    NULL);
 		if (error != 0)
 			goto err;
 #ifdef QUOTA2
 		if (ump->um_flags & UFS_QUOTA2) {
 			error = quota2_handle_cmd_delete(ump, qk);
 		} else
 #endif
 			panic("quota_handle_cmd_get: no support ?");
 		if (error && error != ENOENT)
 			goto err;
+	}
 	return 0;
  err:
 	return error;
+}
 static int
 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_CURSORGET);
 	cursor = args->u.cursorget.qc_cursor;
 	keys = args->u.cursorget.qc_keys;
 	vals = args->u.cursorget.qc_vals;
 	maxnum = args->u.cursorget.qc_maxnum;
 	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_cursorget(ump, cursor, keys, vals,
 						    maxnum, ret);
 	} else
 #endif
 		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);
 	cursor = args->u.cursoropen.qc_cursor;
 	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_cursoropen(ump, cursor);
 	} else
 #endif
 		error = EOPNOTSUPP;
 	return error;
+}
 static int
 quota_handle_cmd_cursorclose(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_CURSORCLOSE);
 	cursor = args->u.cursorclose.qc_cursor;
 	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_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)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int idtype;
 	const char *qfile;
 	int error;
 	KASSERT(args->qc_type == QCT_QUOTAON);
 	idtype = args->u.quotaon.qc_idtype;
 	qfile = args->u.quotaon.qc_quotafile;
 	if ((ump->um_flags & UFS_QUOTA2) != 0)
 		return EBUSY;
 	error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 	    KAUTH_REQ_SYSTEM_FS_QUOTA_ONOFF, mp, NULL, NULL);
 	if (error != 0) {
 		return error;
+	}
 #ifdef QUOTA
 	error = quota1_handle_cmd_quotaon(l, ump, idtype, qfile);
 #else
 	error = EOPNOTSUPP;
 #endif
 	return error;
+}
 static int
 quota_handle_cmd_quotaoff(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int idtype;
 	int error;
 	prop_dictionary_t cmddict;
 	int q2type;
 	prop_array_t datas;
 	KASSERT(args->qc_type == QCT_PROPLIB);
 	cmddict = args->u.proplib.qc_cmddict;
 	q2type = args->u.proplib.qc_q2type;
 	datas = args->u.proplib.qc_datas;
-	KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
+	KASSERT(args->qc_type == QCT_QUOTAOFF);
-	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
+	idtype = args->u.quotaoff.qc_idtype;
 	if ((ump->um_flags & UFS_QUOTA2) != 0)
 		return EOPNOTSUPP;
 	if (prop_array_count(datas) != 0)
 		return EINVAL;
 	error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 	    KAUTH_REQ_SYSTEM_FS_QUOTA_ONOFF, mp, NULL, NULL);
 	if (error != 0) {
 		return error;
+	}
 #ifdef QUOTA
-	error = quota1_handle_cmd_quotaoff(l, ump, q2type);
+	error = quota1_handle_cmd_quotaoff(l, ump, idtype);
 #else
 	error = EOPNOTSUPP;
 #endif
 	return error;
+}
 /*
  * Initialize the quota system.
  */
 void
 dqinit(void)
+{
 	mutex_init(&dqlock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&dqcv, "quota");
 	dqhashtbl = hashinit(desiredvnodes, HASH_LIST, true, &dqhash);
 	dquot_cache = pool_cache_init(sizeof(struct dquot), 0, 0, 0, "ufsdq",
 	    NULL, IPL_NONE, NULL, NULL, NULL);
+}
 void
 dqreinit(void)
+{
 	struct dquot *dq;
 	struct dqhashhead *oldhash, *hash;
 	struct vnode *dqvp;
 	u_long oldmask, mask, hashval;
 	int i;
 	hash = hashinit(desiredvnodes, HASH_LIST, true, &mask);
 	mutex_enter(&dqlock);
 	oldhash = dqhashtbl;
 	oldmask = dqhash;
 	dqhashtbl = hash;
 	dqhash = mask;
 	for (i = 0; i <= oldmask; i++) {
 		while ((dq = LIST_FIRST(&oldhash[i])) != NULL) {
 			dqvp = dq->dq_ump->um_quotas[dq->dq_type];
 			LIST_REMOVE(dq, dq_hash);
 			hashval = DQHASH(dqvp, dq->dq_id);
 			LIST_INSERT_HEAD(&dqhashtbl[hashval], dq, dq_hash);
+		}
+	}
 	mutex_exit(&dqlock);
 	hashdone(oldhash, HASH_LIST, oldmask);
+}
 /*
  * Free resources held by quota system.
  */
 void
 dqdone(void)
+{
 	pool_cache_destroy(dquot_cache);
 	hashdone(dqhashtbl, HASH_LIST, dqhash);
 	cv_destroy(&dqcv);
 	mutex_destroy(&dqlock);
+}
 /*
  * Set up the quotas for an inode.
+ *
  * This routine completely defines the semantics of quotas.
  * If other criterion want to be used to establish quotas, the
  * MAXQUOTAS value in quotas.h should be increased, and the
  * additional dquots set up here.
  */
 int
 getinoquota(struct inode *ip)
+{
 	struct ufsmount *ump = ip->i_ump;
 	struct vnode *vp = ITOV(ip);
 	int i, error;
 	u_int32_t ino_ids[MAXQUOTAS];
 	/*
 	 * To avoid deadlocks never update quotas for quota files
 	 * on the same file system
 	 */
 	for (i = 0; i < MAXQUOTAS; i++)
 		if (vp == ump->um_quotas[i])
 			return 0;
 	ino_ids[USRQUOTA] = ip->i_uid;
 	ino_ids[GRPQUOTA] = ip->i_gid;
 	for (i = 0; i < MAXQUOTAS; i++) {
 		/*
 		 * If the file id changed the quota needs update.
 		 */
 		if (ip->i_dquot[i] != NODQUOT &&
 		    ip->i_dquot[i]->dq_id != ino_ids[i]) {
 			dqrele(ITOV(ip), ip->i_dquot[i]);
 			ip->i_dquot[i] = NODQUOT;
+		}
 		/*
 		 * Set up the quota based on file id.
 		 * ENODEV means that quotas are not enabled.
 		 */
 		if (ip->i_dquot[i] == NODQUOT &&
 		    (error = dqget(vp, ino_ids[i], ump, i, &ip->i_dquot[i])) &&
 		    error != ENODEV)
 			return (error);
+	}
 	return 0;
+}
 /*
  * Obtain a dquot structure for the specified identifier and quota file
  * reading the information from the file if necessary.
  */
 int
 dqget(struct vnode *vp, u_long id, struct ufsmount *ump, int type,
     struct dquot **dqp)
+{
 	struct dquot *dq, *ndq;
 	struct dqhashhead *dqh;
 	struct vnode *dqvp;
 	int error = 0; /* XXX gcc */
 	/* Lock to see an up to date value for QTF_CLOSING. */
 	mutex_enter(&dqlock);
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0) {
 		mutex_exit(&dqlock);
 		*dqp = NODQUOT;
 		return (ENODEV);
+	}
 	dqvp = ump->um_quotas[type];
 #ifdef QUOTA
 	if (ump->um_flags & UFS_QUOTA) {
 		if (dqvp == NULLVP || (ump->umq1_qflags[type] & QTF_CLOSING)) {
 			mutex_exit(&dqlock);
 			*dqp = NODQUOT;
 			return (ENODEV);
+		}
+	}
 #endif
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
 		if (dqvp == NULLVP) {
 			mutex_exit(&dqlock);
 			*dqp = NODQUOT;
 			return (ENODEV);
+		}
+	}
 #endif
 	KASSERT(dqvp != vp);
 	/*
 	 * Check the cache first.
 	 */
 	dqh = &dqhashtbl[DQHASH(dqvp, id)];
 	LIST_FOREACH(dq, dqh, dq_hash) {
 		if (dq->dq_id != id ||
 		    dq->dq_ump->um_quotas[dq->dq_type] != dqvp)
 			continue;
 		KASSERT(dq->dq_cnt > 0);
 		dqref(dq);
 		mutex_exit(&dqlock);
 		*dqp = dq;
 		return (0);
+	}
 	/*
 	 * Not in cache, allocate a new one.
 	 */
 	mutex_exit(&dqlock);
 	ndq = pool_cache_get(dquot_cache, PR_WAITOK);
 	/*
 	 * Initialize the contents of the dquot structure.
 	 */
 	memset((char *)ndq, 0, sizeof *ndq);
 	ndq->dq_flags = 0;
 	ndq->dq_id = id;
 	ndq->dq_ump = ump;
 	ndq->dq_type = type;
 	mutex_init(&ndq->dq_interlock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_enter(&dqlock);
 	dqh = &dqhashtbl[DQHASH(dqvp, id)];
 	LIST_FOREACH(dq, dqh, dq_hash) {
 		if (dq->dq_id != id ||
 		    dq->dq_ump->um_quotas[dq->dq_type] != dqvp)
 			continue;
 		/*
 		 * Another thread beat us allocating this dquot.
 		 */
 		KASSERT(dq->dq_cnt > 0);
 		dqref(dq);
 		mutex_exit(&dqlock);
 		mutex_destroy(&ndq->dq_interlock);
 		pool_cache_put(dquot_cache, ndq);
 		*dqp = dq;
 		return 0;
+	}
 	dq = ndq;
 	LIST_INSERT_HEAD(dqh, dq, dq_hash);
 	dqref(dq);
 	mutex_enter(&dq->dq_interlock);
 	mutex_exit(&dqlock);
 #ifdef QUOTA
 	if (ump->um_flags & UFS_QUOTA)
 		error = dq1get(dqvp, id, ump, type, dq);
 #endif
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2)
 		error = dq2get(dqvp, id, ump, type, dq);
 #endif
 	/*
 	 * I/O error in reading quota file, release
 	 * quota structure and reflect problem to caller.
 	 */
 	if (error) {
 		mutex_enter(&dqlock);
 		LIST_REMOVE(dq, dq_hash);
 		mutex_exit(&dqlock);
 		mutex_exit(&dq->dq_interlock);
 		dqrele(vp, dq);
 		*dqp = NODQUOT;
 		return (error);
+	}
 	mutex_exit(&dq->dq_interlock);
 	*dqp = dq;
 	return (0);
+}
 /*
  * Obtain a reference to a dquot.
  */
 void
 dqref(struct dquot *dq)
+{
 	KASSERT(mutex_owned(&dqlock));
 	dq->dq_cnt++;
 	KASSERT(dq->dq_cnt > 0);
+}
 /*
  * Release a reference to a dquot.
  */
 void
 dqrele(struct vnode *vp, struct dquot *dq)
+{
 	if (dq == NODQUOT)
 		return;
 	mutex_enter(&dq->dq_interlock);
 	for (;;) {
 		mutex_enter(&dqlock);
 		if (dq->dq_cnt > 1) {
 			dq->dq_cnt--;
 			mutex_exit(&dqlock);
 			mutex_exit(&dq->dq_interlock);
 			return;
+		}
 		if ((dq->dq_flags & DQ_MOD) == 0)
 			break;
 		mutex_exit(&dqlock);
 #ifdef QUOTA
 		if (dq->dq_ump->um_flags & UFS_QUOTA)
 			(void) dq1sync(vp, dq);
 #endif
 #ifdef QUOTA2
 		if (dq->dq_ump->um_flags & UFS_QUOTA2)
 			(void) dq2sync(vp, dq);
 #endif
+	}
 	KASSERT(dq->dq_cnt == 1 && (dq->dq_flags & DQ_MOD) == 0);
 	LIST_REMOVE(dq, dq_hash);
 	mutex_exit(&dqlock);
 	mutex_exit(&dq->dq_interlock);
 	mutex_destroy(&dq->dq_interlock);
 	pool_cache_put(dquot_cache, dq);
+}
 int
 qsync(struct mount *mp)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 #ifdef QUOTA
 	if (ump->um_flags & UFS_QUOTA)
 		return q1sync(mp);
 #endif
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2)
 		return q2sync(mp);
 #endif
 	return 0;
+}
 #ifdef DIAGNOSTIC
 /*
  * Check the hash chains for stray dquot's.
  */
 void
 dqflush(struct vnode *vp)
+{
 	struct dquot *dq;
 	int i;
 	mutex_enter(&dqlock);
 	for (i = 0; i <= dqhash; i++)
 		LIST_FOREACH(dq, &dqhashtbl[i], dq_hash)
 			KASSERT(dq->dq_ump->um_quotas[dq->dq_type] != vp);
 	mutex_exit(&dqlock);
+}
 #endif

 @@ -1,136 +1,140 @@
-/*	$NetBSD: quotactl.h,v 1.27 2012/01/29 07:11:12 dholland Exp $	*/
+/*	$NetBSD: quotactl.h,v 1.28 2012/01/29 07:11:55 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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.
  */
 #ifndef _SYS_QUOTACTL_H_
 #define _SYS_QUOTACTL_H_
 /*
  * Note - this is an internal interface. Application code (and,
  * really, anything that isn't libquota or inside the kernel) should
  * use the <quota.h> API instead.
  */
 /*
  * Semi-opaque structure for cursors. This holds the cursor state in
  * userland; the size is exposed only to libquota, not to client code,
  * and is meant to be large enough to accomodate all likely future
  * expansion without being unduly bloated, as it will need to be
  * copied in and out for every call using it.
  */
 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_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,	/* quotaoff */
+	QCT_PROPLIB,	/* unused */
 	QCT_GETVERSION,	/* getversion */
 	QCT_GET,	/* get */
 	QCT_PUT,	/* put */
 	QCT_DELETE,	/* delete */
 	QCT_CURSOROPEN,	/* open cursor */
 	QCT_CURSORCLOSE,/* close cursor */
 	QCT_CURSORGET,	/* get from cursor */
 	QCT_CURSORSKIPIDTYPE, /* iteration hint */
 	QCT_CURSORATEND,/* test cursor */
 	QCT_CURSORREWIND,/* reset cursor */
 	QCT_QUOTAON,	/* quotaon */
 	QCT_QUOTAOFF,	/* quotaoff */
 };
 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 {
 			const struct quotakey *qc_key;
 			struct quotaval *qc_ret;
 		} get;
 		struct {
 			const struct quotakey *qc_key;
 			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;
 		} cursorget;
 		struct {
 			struct quotakcursor *qc_cursor;
 			int *qc_ret; /* really boolean */
 		} cursoratend;
 		struct {
 			struct quotakcursor *qc_cursor;
 		} cursorrewind;
 		struct {
 			int qc_idtype;
 			const char *qc_quotafile;
 		} quotaon;
 		struct {
 			int qc_idtype;
 		} quotaoff;
 	} u;
 };
 #endif /* _SYS_QUOTACTL_H_ */