 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_quotactl.c,v 1.16 2012/01/29 06:51:42 dholland Exp $	*/
+/*	$NetBSD: vfs_quotactl.c,v 1.17 2012/01/29 06:52:38 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.16 2012/01/29 06:51:42 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.17 2012/01/29 06:52:38 dholland Exp $");
 #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;
 @@ -485,27 +485,26 @@ vfs_quotactl_clear(struct mount *mp,
 				continue;
 			if (strcmp(idstr, "default"))
 				continue;
 			id = 0;
 			defaultq = 1;
 		} else {
 			defaultq = 0;
+		}
 		args.qc_type = QCT_CLEAR;
 		args.u.clear.qc_idtype = q2type;
 		args.u.clear.qc_id = id;
 		args.u.clear.qc_defaultq = defaultq;
 		args.u.clear.qc_data = data;
 		error = VFS_QUOTACTL(mp, QUOTACTL_CLEAR, &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;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quotactl.h,v 1.14 2012/01/29 06:51:43 dholland Exp $	*/
+/*	$NetBSD: quotactl.h,v 1.15 2012/01/29 06:52:39 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
 @@ -67,19 +67,18 @@ struct vfs_quotactl_args {
 		} 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 {
 			int qc_idtype;
 			id_t qc_id;
 			int qc_defaultq;
 			prop_dictionary_t qc_data;
 		} clear;
 	} u;
 };
 #endif /* _SYS_QUOTACTL_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.c,v 1.88 2012/01/29 06:51:43 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.c,v 1.89 2012/01/29 06:52:39 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.88 2012/01/29 06:51:43 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.89 2012/01/29 06:52:39 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>
 @@ -309,50 +309,46 @@ quota_handle_cmd_put(struct mount *mp, s
+	}
 	return error;
+}
 static int
 quota_handle_cmd_clear(struct mount *mp, struct lwp *l,
     struct vfs_quotactl_args *args)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	int idtype;
 	id_t id;
 	int defaultq;
 	prop_dictionary_t data;
 	int error;
 	KASSERT(args->qc_type == QCT_CLEAR);
 	idtype = args->u.clear.qc_idtype;
 	id = args->u.clear.qc_id;
 	defaultq = args->u.clear.qc_defaultq;
 	data = args->u.clear.qc_data;
 	KASSERT(prop_object_type(data) == PROP_TYPE_DICTIONARY);
 	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(id), NULL);
 		if (error != 0)
 			goto err;
 #ifdef QUOTA2
 		if (ump->um_flags & UFS_QUOTA2) {
-			error = quota2_handle_cmd_clear(ump, idtype, id, defaultq,
+			error = quota2_handle_cmd_clear(ump, idtype, id,
-			    data);
+			    defaultq);
 		} else
 #endif
 			panic("quota_handle_cmd_get: no support ?");
 		if (error && error != ENOENT)
 			goto err;
+	}
 	return 0;
  err:
 	return error;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.h,v 1.10 2012/01/29 06:49:44 dholland Exp $	*/
+/*	$NetBSD: ufs_quota.h,v 1.11 2012/01/29 06:52:39 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.
 @@ -117,18 +117,18 @@ int quota1_handle_cmd_get(struct ufsmoun
     struct quotaval *);
 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_clear(struct ufsmount *, int, int, int, prop_dictionary_t);
+int quota2_handle_cmd_clear(struct ufsmount *, int, int, int);
 int quota2_handle_cmd_getall(struct ufsmount *, int, prop_array_t);
 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.11 2012/01/29 06:49:44 dholland Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.12 2012/01/29 06:52:39 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.11 2012/01/29 06:49:44 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.12 2012/01/29 06:52:39 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>
 @@ -698,100 +698,100 @@ dq2clear_callback(struct ufsmount *ump,
 		c->dq->dq2_lblkno = 0;
 		c->dq->dq2_blkoff = 0;
 		myoff = *offp;
 		/* remove from hash list */
 		*offp = q2e->q2e_next;
 		/* add to free list */
 		q2e->q2e_next = c->q2h->q2h_free;
 		c->q2h->q2h_free = myoff;
 		return Q2WL_ABORT;
+	}
 	return 0;
+}
 int
-quota2_handle_cmd_clear(struct ufsmount *ump, int type, int id,
+quota2_handle_cmd_clear(struct ufsmount *ump, int idtype, int id,
-    int defaultq, prop_dictionary_t data)
+    int defaultq)
+{
 	int error, i;
 	struct dquot *dq;
 	struct quota2_header *q2h;
 	struct quota2_entry q2e, *q2ep;
 	struct buf *hbp, *bp;
 	u_long hash_mask;
 	struct dq2clear_callback c;
-	if (ump->um_quotas[type] == NULLVP)
+	if (ump->um_quotas[idtype] == NULLVP)
 		return ENODEV;
 	if (defaultq)
 		return EOPNOTSUPP;
 	/* get the default entry before locking the entry's buffer */
 	mutex_enter(&dqlock);
-	error = getq2h(ump, type, &hbp, &q2h, 0);
+	error = getq2h(ump, idtype, &hbp, &q2h, 0);
 	if (error) {
 		mutex_exit(&dqlock);
 		return error;
+	}
 	/* we'll copy to another disk entry, so no need to swap */
 	memcpy(&q2e, &q2h->q2h_defentry, sizeof(q2e));
 	mutex_exit(&dqlock);
 	brelse(hbp, 0);
-	error = dqget(NULLVP, id, ump, type, &dq);
+	error = dqget(NULLVP, id, ump, idtype, &dq);
 	if (error)
 		return error;
 	mutex_enter(&dq->dq_interlock);
 	if (dq->dq2_lblkno == 0 && dq->dq2_blkoff == 0) {
 		/* already clear, nothing to do */
 		error = ENOENT;
 		goto out_il;
+	}
 	error = UFS_WAPBL_BEGIN(ump->um_mountp);
 	if (error)
 		goto out_dq;
-	error = getq2e(ump, type, dq->dq2_lblkno, dq->dq2_blkoff,
+	error = getq2e(ump, idtype, dq->dq2_lblkno, dq->dq2_blkoff,
 	    &bp, &q2ep, B_MODIFY);
 	if (error)
 		goto out_wapbl;
 	if (q2ep->q2e_val[QL_BLOCK].q2v_cur != 0 ||
 	    q2ep->q2e_val[QL_FILE].q2v_cur != 0) {
 		/* can't free this entry; revert to default */
 		for (i = 0; i < N_QL; i++) {
 			q2ep->q2e_val[i].q2v_softlimit =
 			    q2e.q2e_val[i].q2v_softlimit;
 			q2ep->q2e_val[i].q2v_hardlimit =
 			    q2e.q2e_val[i].q2v_hardlimit;
 			q2ep->q2e_val[i].q2v_grace =
 			    q2e.q2e_val[i].q2v_grace;
 			q2ep->q2e_val[i].q2v_time = 0;
+		}
 		quota2_bwrite(ump->um_mountp, bp);
 		goto out_wapbl;
+	}
 	/* we can free it. release bp so we can walk the list */
 	brelse(bp, 0);
 	mutex_enter(&dqlock);
-	error = getq2h(ump, type, &hbp, &q2h, 0);
+	error = getq2h(ump, idtype, &hbp, &q2h, 0);
 	if (error)
 		goto out_dqlock;
 	hash_mask = ((1 << q2h->q2h_hash_shift) - 1);
 	c.dq = dq;
 	c.id = id;
 	c.q2h = q2h;
-	error = quota2_walk_list(ump, hbp, type,
+	error = quota2_walk_list(ump, hbp, idtype,
 	    &q2h->q2h_entries[id & hash_mask], B_MODIFY, &c,
 	    dq2clear_callback);
 	bwrite(hbp);
 out_dqlock:
 	mutex_exit(&dqlock);
 out_wapbl:
 	UFS_WAPBL_END(ump->um_mountp);
 out_il:
 	mutex_exit(&dq->dq_interlock);
 out_dq:
 	dqrele(NULLVP, dq);