 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_quotactl.c,v 1.6 2012/01/29 06:36:50 dholland Exp $	*/
+/*	$NetBSD: vfs_quotactl.c,v 1.7 2012/01/29 06:37:30 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.6 2012/01/29 06:36:50 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.7 2012/01/29 06:37:30 dholland Exp $");
 #include <sys/mount.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;
 @@ -160,33 +160,94 @@ vfs_quotactl_quotaoff(struct mount *mp,
 	args.qc_type = QCT_PROPLIB;
 	args.u.proplib.qc_cmddict = cmddict;
 	args.u.proplib.qc_q2type = q2type;
 	args.u.proplib.qc_datas = datas;
 	return VFS_QUOTACTL(mp, QUOTACTL_QUOTAOFF, &args);
+}
 static int
 vfs_quotactl_get(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	prop_object_iterator_t iter;
 	prop_dictionary_t data;
 	uint32_t id;
 	int defaultq;
 	const char *idstr;
 	prop_array_t replies;
 	struct vfs_quotactl_args args;
 	int error;
-	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;
+	replies = prop_array_create();
-	return VFS_QUOTACTL(mp, QUOTACTL_GET, &args);
+	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")) {
 				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_replies = replies;
 		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;
+		}
+	}
 	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_set(struct mount *mp,
 			prop_dictionary_t cmddict, int q2type,
 			prop_array_t datas)
+{
 	struct vfs_quotactl_args args;
 	args.qc_type = QCT_PROPLIB;
 	args.u.proplib.qc_cmddict = cmddict;
 	args.u.proplib.qc_q2type = q2type;
 	args.u.proplib.qc_datas = datas;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quotactl.h,v 1.4 2012/01/29 06:36:50 dholland Exp $	*/
+/*	$NetBSD: quotactl.h,v 1.5 2012/01/29 06:37:30 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
 @@ -40,29 +40,36 @@
 /* Command codes. */
 #define QUOTACTL_GETVERSION	0
 #define QUOTACTL_QUOTAON	1
 #define QUOTACTL_QUOTAOFF	2
 #define QUOTACTL_GET		3
 #define QUOTACTL_SET		4
 #define QUOTACTL_GETALL		5
 #define QUOTACTL_CLEAR		6
 /* Argument encoding. */
 enum vfs_quotactl_argtypes {
 	QCT_PROPLIB,	/* quotaon/off, get, set, getall, clear */
 	QCT_GETVERSION,	/* getversion */
 	QCT_GET,	/* get */
 };
 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 {
 			int qc_q2type;
 			id_t qc_id;
 			int qc_defaultq;
 			prop_array_t qc_replies;
 		} get;
 	} u;
 };
 #endif /* _SYS_QUOTACTL_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.c,v 1.73 2012/01/29 06:36:51 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.c,v 1.74 2012/01/29 06:37:30 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.73 2012/01/29 06:36:51 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.74 2012/01/29 06:37:30 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>
 @@ -220,105 +220,64 @@ quota_handle_cmd_get_version(struct moun
 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)
+{
 	prop_array_t replies;
 	prop_object_iterator_t iter;
 	prop_dictionary_t data;
 	uint32_t id;
 	struct ufsmount *ump = VFSTOUFS(mp);
-	int error, defaultq = 0;
+	int error;
-	const char *idstr;
+	id_t id;
 	prop_dictionary_t cmddict;
 	int q2type;
-	prop_array_t datas;
+	int defaultq;
 	prop_array_t replies;
 	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_GET);
-	KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
+	id = args->u.get.qc_id;
 	q2type = args->u.get.qc_q2type;
 	defaultq = args->u.get.qc_defaultq;
 	replies = args->u.get.qc_replies;
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
 		return EOPNOTSUPP;
-	replies = prop_array_create();
+	/* avoid whitespace diffs */ {
 	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")) {
 				error = EINVAL;
 				goto err;
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
 		error = quota_get_auth(mp, l, id);
 		if (error == EPERM)
 			continue;
 		if (error != 0)
-			goto err;
+			return error;
 #ifdef QUOTA
 		if (ump->um_flags & UFS_QUOTA)
 			error = quota1_handle_cmd_get(ump, q2type, id, defaultq,
 			    replies);
 		else
 #endif
 #ifdef QUOTA2
 		if (ump->um_flags & UFS_QUOTA2) {
 			error = quota2_handle_cmd_get(ump, q2type, id, defaultq,
 			    replies);
 		} else
 #endif
 			panic("quota_handle_cmd_get: no support ?");
 		if (error == ENOENT)
 			continue;
 		if (error != 0)
-			goto err;
+			return error;
 	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
 quota_handle_cmd_set(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	prop_array_t replies;
 	prop_object_iterator_t iter;
 	prop_dictionary_t data;
 	uint32_t id;
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int error, defaultq = 0;