 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls_50.c,v 1.12 2012/01/29 06:29:04 dholland Exp $	*/
+/*	$NetBSD: vfs_syscalls_50.c,v 1.13 2012/01/29 07:16:00 dholland Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
 @@ -26,27 +26,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.12 2012/01/29 06:29:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.13 2012/01/29 07:16:00 dholland Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/socketvar.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 @@ -328,26 +328,27 @@ compat_50_sys_quotactl(struct lwp *l, co
 		syscallarg(void *) arg;
 	} */
 	struct mount *mp;
 	int error;
 	uint8_t error8;
 	struct vnode *vp;
 	int q1cmd = SCARG(uap, cmd);
 	prop_dictionary_t dict, data, cmd;
 	prop_array_t cmds, datas;
 	char *bufpath;
 	struct dqblk dqblk;
 	struct quotaval qv[QUOTA_NLIMITS];
 	uint64_t *values[QUOTA_NLIMITS];
 	int idtype;
 	values[QUOTA_LIMIT_BLOCK] = &qv[QUOTA_LIMIT_BLOCK].qv_hardlimit;
 	values[QUOTA_LIMIT_FILE] = &qv[QUOTA_LIMIT_FILE].qv_hardlimit;
 	error = namei_simple_user(SCARG(uap, path),
 				NSM_FOLLOW_TRYEMULROOT, &vp);
 	if (error != 0)
 		return (error);
 	error = ENOMEM;
 	mp = vp->v_mount;
 	if ((dict = quota_prop_create()) == NULL)
 		goto out;
 	if ((cmds = prop_array_create()) == NULL)
 @@ -366,36 +367,38 @@ compat_50_sys_quotactl(struct lwp *l, co
 		error = copyinstr(SCARG(uap, arg), bufpath, PATH_MAX, NULL);
 		if (error != 0) {
 			free(bufpath, M_TEMP);
 			goto out_data;
+		}
 		if (!prop_dictionary_set_cstring(data, "quotafile", bufpath))
 			error = ENOMEM;
 		free(bufpath, M_TEMP);
 		if (error)
 			goto out_data;
 		error = ENOMEM;
 		if (!prop_array_add_and_rel(datas, data))
 			goto out_datas;
 		idtype = quota_idtype_from_ufs(q1cmd & SUBCMDMASK);
 		if (!quota_prop_add_command(cmds, "quotaon",
-		    ufs_quota_class_names[qtype2ufsclass(q1cmd & SUBCMDMASK)],
+		    ufs_quota_class_names[idtype],
 		    datas))
 			goto out_cmds;
 		goto do_quotaonoff;
 	case Q_QUOTAOFF:
 		error = ENOMEM;
 		idtype = quota_idtype_from_ufs(q1cmd & SUBCMDMASK);
 		if (!quota_prop_add_command(cmds, "quotaoff",
-		    ufs_quota_class_names[qtype2ufsclass(q1cmd & SUBCMDMASK)],
+		    ufs_quota_class_names[idtype],
 		    datas))
 			goto out_cmds;
 do_quotaonoff:
 		if (!prop_dictionary_set_and_rel(dict, "commands", cmds))
 			goto out_dict;
 		error = vfs_quotactl(mp, dict);
 		if (error)
 			goto out_dict;
 		if ((error = quota_get_cmds(dict, &cmds)) != 0)
 			goto out_dict;
 		cmd = prop_array_get(cmds, 0);
 		if (cmd == NULL) {
 			error = EINVAL;
 @@ -407,28 +410,29 @@ do_quotaonoff:
+		}
 		error = error8;
 		goto out_dict;
 	case Q_GETQUOTA:
 		error = ENOMEM;
 		data = prop_dictionary_create();
 		if (data == NULL)
 			goto out_datas;
 		if (!prop_dictionary_set_uint32(data, "id", SCARG(uap, uid)))
 			goto out_data;
 		if (!prop_array_add_and_rel(datas, data))
 			goto out_datas;
 		idtype = quota_idtype_from_ufs(q1cmd & SUBCMDMASK);
 		if (!quota_prop_add_command(cmds, "get",
-		    ufs_quota_class_names[qtype2ufsclass(q1cmd & SUBCMDMASK)],
+		    ufs_quota_class_names[idtype],
 		    datas))
 			goto out_cmds;
 		if (!prop_dictionary_set_and_rel(dict, "commands", cmds))
 			goto out_dict;
 		error = vfs_quotactl(mp, dict);
 		if (error)
 			goto out_dict;
 		if ((error = quota_get_cmds(dict, &cmds)) != 0)
 			goto out_dict;
 		cmd = prop_array_get(cmds, 0);
 		if (cmd == NULL) {
 			error = EINVAL;
 			goto out_dict;
 @@ -463,28 +467,29 @@ do_quotaonoff:
 		if (error)
 			goto out_datas;
 		dqblk_to_quotavals(&dqblk, &qv[QUOTA_LIMIT_BLOCK],
 				   &qv[QUOTA_LIMIT_FILE]);
 		error = ENOMEM;
 		data = quota64toprop(SCARG(uap, uid), 0, values,
 		    ufs_quota_entry_names, UFS_QUOTA_NENTRIES,
 		    ufs_quota_limit_names, QUOTA_NLIMITS);
 		if (data == NULL)
 			goto out_data;
 		if (!prop_array_add_and_rel(datas, data))
 			goto out_datas;
 		idtype = quota_idtype_from_ufs(q1cmd & SUBCMDMASK);
 		if (!quota_prop_add_command(cmds, "set",
-		    ufs_quota_class_names[qtype2ufsclass(q1cmd & SUBCMDMASK)],
+		    ufs_quota_class_names[idtype],
 		    datas))
 			goto out_cmds;
 		if (!prop_dictionary_set_and_rel(dict, "commands", cmds))
 			goto out_dict;
 		error = vfs_quotactl(mp, dict);
 		if (error)
 			goto out_dict;
 		if ((error = quota_get_cmds(dict, &cmds)) != 0)
 			goto out_dict;
 		cmd = prop_array_get(cmds, 0);
 		if (cmd == NULL) {
 			error = EINVAL;
 			goto out_dict;
 @@ -492,28 +497,29 @@ do_quotaonoff:
 		if (!prop_dictionary_get_int8(cmd, "return", &error8)) {
 			error = EINVAL;
 			goto out_dict;
+		}
 		error = error8;
 		goto out_dict;
 	case Q_SYNC:
 		/*
 		 * not supported but used only to see if quota is supported,
 		 * emulate with a "get version"
 		 */
 		error = ENOMEM;
 		idtype = quota_idtype_from_ufs(q1cmd & SUBCMDMASK);
 		if (!quota_prop_add_command(cmds, "get version",
-		    ufs_quota_class_names[qtype2ufsclass(q1cmd & SUBCMDMASK)],
+		    ufs_quota_class_names[idtype],
 		    datas))
 			goto out_cmds;
 		if (!prop_dictionary_set_and_rel(dict, "commands", cmds))
 			goto out_dict;
 		error = vfs_quotactl(mp, dict);
 		if (error)
 			goto out_dict;
 		if ((error = quota_get_cmds(dict, &cmds)) != 0)
 			goto out_dict;
 		cmd = prop_array_get(cmds, 0);
 		if (cmd == NULL) {
 			error = EINVAL;
 			goto out_dict;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quota.h,v 1.28 2011/03/25 10:25:17 bouyer Exp $	*/
+/*	$NetBSD: quota.h,v 1.29 2012/01/29 07:16:00 dholland Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1993
  *	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.
 @@ -45,48 +45,48 @@
 /*
  * The following constants define the usage of the quota file array in the
  * ufsmount structure and dquot array in the inode structure.  The semantics
  * of the elements of these arrays are defined in the routine getinoquota;
  * the remainder of the quota code treats them generically and need not be
  * inspected when changing the size of the array.
  */
 #define	MAXQUOTAS	2
 #define	USRQUOTA	0	/* element used for user quotas */
 #define	GRPQUOTA	1	/* element used for group quotas */
 #if !defined(HAVE_NBTOOL_CONFIG_H)
-#include <quota/quotaprop.h>
+#include <sys/quota.h>
 __inline static int __unused
-ufsclass2qtype(int class)
+quota_idtype_to_ufs(int idtype)
+{
-	switch(class) {
+	switch (idtype) {
-	case QUOTA_CLASS_USER:
+	case QUOTA_IDTYPE_USER:
 		return USRQUOTA;
-	case QUOTA_CLASS_GROUP:
+	case QUOTA_IDTYPE_GROUP:
 		return GRPQUOTA;
 	default:
 		return -1;
+	}
+}
 static __inline int __unused
-qtype2ufsclass(int type)
+quota_idtype_from_ufs(int ufstype)
+{
-	switch(type) {
+	switch (ufstype) {
 	case USRQUOTA:
-		return QUOTA_CLASS_USER;
+		return QUOTA_IDTYPE_USER;
 	case GRPQUOTA:
-		return QUOTA_CLASS_GROUP;
+		return QUOTA_IDTYPE_GROUP;
 	default:
 		return -1;
+	}
+}
 #endif /* !defined(HAVE_NBTOOL_CONFIG_H) */
 #ifdef _KERNEL
 #include <sys/cdefs.h>
 __BEGIN_DECLS
 void	dqinit(void);
 void	dqreinit(void);

 @@ -1,14 +1,14 @@
-/*      $NetBSD: edquota.c,v 1.42 2012/01/29 06:23:20 dholland Exp $ */
+/*      $NetBSD: edquota.c,v 1.43 2012/01/29 07:16:00 dholland Exp $ */
 /*
  * Copyright (c) 1980, 1990, 1993
  *	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
 @@ -31,27 +31,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "from: @(#)edquota.c	8.3 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: edquota.c,v 1.42 2012/01/29 06:23:20 dholland Exp $");
+__RCSID("$NetBSD: edquota.c,v 1.43 2012/01/29 07:16:00 dholland Exp $");
 #endif
 #endif /* not lint */
 /*
  * Disk quota editor.
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/wait.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/statvfs.h>
 @@ -278,27 +278,27 @@ getprivs1(long id, int idtype, const cha
 	setfsent();
 	while ((fs = getfsent()) != NULL) {
 		if (strcmp(fs->fs_vfstype, "ffs"))
 			continue;
 		if (strcmp(fs->fs_spec, filesys) == 0 ||
 		    strcmp(fs->fs_file, filesys) == 0)
 			break;
+	}
 	if (fs == NULL)
 		return NULL;
 	if (!hasquota(qfpathname, sizeof(qfpathname), fs,
-	    ufsclass2qtype(idtype)))
+	    quota_idtype_to_ufs(idtype)))
 		return NULL;
 	qup = quotause_create();
 	strcpy(qup->fsname, fs->fs_file);
 	if ((fd = open(qfpathname, O_RDONLY)) < 0) {
 		fd = open(qfpathname, O_RDWR|O_CREAT, 0640);
 		if (fd < 0 && errno != ENOENT) {
 			warnx("open `%s'", qfpathname);
 			quotause_destroy(qup);
 			return NULL;
+		}
 		warnx("Creating quota file %s", qfpathname);
 		sleep(3);