 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_quotactl.c,v 1.25 2012/01/29 07:06:01 dholland Exp $	*/
+/*	$NetBSD: vfs_quotactl.c,v 1.26 2012/01/29 07:06:37 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.25 2012/01/29 07:06:01 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.26 2012/01/29 07:06:37 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;
 @@ -429,101 +429,120 @@ vfs_quotactl_put(struct mount *mp,
 	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(id_t id, int def,
+vfs_quotactl_getall_makereply(const struct quotakey *key)
 			      const struct quotaval *blocks,
-			      const struct quotaval *files)
+	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 dict1 = prop_dictionary_create();
 	prop_dictionary_t dict2;
 	const char *objtypename;
-	if (dict1 == NULL)
+	switch (key->qk_objtype) {
-		return NULL;
+	    case QUOTA_OBJTYPE_BLOCKS:
 		objtypename = QUOTADICT_LTYPE_BLOCK;
-	if (def) {
+		break;
-		if (!prop_dictionary_set_cstring_nocopy(dict1, "id",
+	    case QUOTA_OBJTYPE_FILES:
-		    "default")) {
+		objtypename = QUOTADICT_LTYPE_FILE;
-			goto err;
+		break;
 	    default:
-	} else {
+		return EINVAL;
 		if (!prop_dictionary_set_uint32(dict1, "id", id)) {
 			goto err;
+	}
-	vals[0] = blocks->qv_hardlimit;
+	vals[0] = val->qv_hardlimit;
-	vals[1] = blocks->qv_softlimit;
+	vals[1] = val->qv_softlimit;
-	vals[2] = blocks->qv_usage;
+	vals[2] = val->qv_usage;
-	vals[3] = blocks->qv_expiretime;
+	vals[3] = val->qv_expiretime;
-	vals[4] = blocks->qv_grace;
+	vals[4] = val->qv_grace;
 	dict2 = limits64toprop(vals, val_names, N_QV);
 	if (dict2 == NULL)
 		goto err;
 	if (!prop_dictionary_set_and_rel(dict1, QUOTADICT_LTYPE_BLOCK, dict2))
 		goto err;
 	vals[0] = files->qv_hardlimit;
 	vals[1] = files->qv_softlimit;
 	vals[2] = files->qv_usage;
 	vals[3] = files->qv_expiretime;
 	vals[4] = files->qv_grace;
 	dict2 = limits64toprop(vals, val_names, N_QV);
 	if (dict2 == NULL)
-		goto err;
+		return ENOMEM;
 	if (!prop_dictionary_set_and_rel(dict1, QUOTADICT_LTYPE_FILE, dict2))
 		goto err;
-	return dict1;
+	if (!prop_dictionary_set_and_rel(thisreply, objtypename, dict2))
 		return ENOMEM;
-err:
+	return 0;
 	prop_object_release(dict1);
 	return NULL;
+}
 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;
+	prop_dictionary_t thisreply;
 	struct quotakey *key;
 	struct quotaval *val;
 	id_t lastid;
 	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;
 @@ -551,43 +570,54 @@ vfs_quotactl_getall(struct mount *mp,
 		goto err;
+	}
 	replies = prop_array_create();
 	if (replies == NULL) {
 		error = ENOMEM;
 		goto err;
+	}
 	if (skip) {
 		goto skip;
+	}
-	for (i = 0; i < result.qr_num; i += 2) {
+	thisreply = NULL;
-		id = result.qr_keys[i].qk_id;
+	lastid = 0; /* value not actually referenced */
-		if (id == QUOTA_DEFAULTID) {
+	for (i = 0; i < result.qr_num; i++) {
-			id = 0;
+		key = &result.qr_keys[i];
-			defaultq = 1;
+		val = &result.qr_vals[i];
 		} else {
-			defaultq = 0;
+		if (thisreply == NULL || key->qk_id != lastid) {
 			lastid = key->qk_id;
-		dict = vfs_quotactl_getall_makereply(id, defaultq,
+			thisreply = vfs_quotactl_getall_makereply(key);
-						     &result.qr_vals[i],
+			if (thisreply == NULL) {
-						     &result.qr_vals[i+1]);
+				error = ENOMEM;
-		if (dict == NULL) {
+				goto err;
 			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;
+			}
+		}
 		if (!prop_array_add_and_rel(replies, dict)) {
-			error = ENOMEM;
+		error = vfs_quotactl_getall_addreply(thisreply, key, val);
 		if (error) {
 			goto err;
+		}
+	}
 skip:
 	if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
 		error = ENOMEM;
 		goto err;
+	}
 	error = 0;
  err: