 @@ -1,14 +1,14 @@
-/* $NetBSD: quota.h,v 1.10 2012/01/29 06:43:34 dholland Exp $ */
+/* $NetBSD: quota.h,v 1.11 2012/01/29 19:36:14 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.
+  *
 @@ -37,26 +37,35 @@
 /* quota object types (things being limited) */
 #define QUOTA_OBJTYPE_BLOCKS	0
 #define QUOTA_OBJTYPE_FILES	1
 /* id value for "default" */
 #define QUOTA_DEFAULTID		((id_t)-1)
 /* limit value for "no limit" */
 #define QUOTA_NOLIMIT		((uint64_t)0xffffffffffffffffULL)
 /* time value for "no time" */
 #define QUOTA_NOTIME		((time_t)-1)
 /*
  * Semantic restrictions. These are hints applications can use
  * to help produce comprehensible error diagnostics when something
  * unsupported is attempted.
  */
 #define QUOTA_RESTRICT_NEEDSQUOTACHECK	0x1	/* quotacheck(8) required */
 #define QUOTA_RESTRICT_UNIFORMGRACE	0x2	/* grace time is global */
 #define QUOTA_RESTRICT_32BIT		0x4	/* values limited to 2^32 */
 /*
  * Structure used to describe the key part of a quota record.
  */
 struct quotakey {
 	int qk_idtype;		/* type of id (user, group, etc.) */
 	id_t qk_id;		/* actual id number */
 	int qk_objtype;		/* type of fs object (blocks, files, etc.) */
 };
 /*
  * Structure used to describe the value part of a quota record.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quotactl.h,v 1.30 2012/01/29 07:13:43 dholland Exp $	*/
+/*	$NetBSD: quotactl.h,v 1.31 2012/01/29 19:36:14 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
 @@ -30,41 +30,34 @@
 #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.
  */
 /* Size of random quota strings */
 #define QUOTA_NAMELEN   32
 /*
  * Restrictions for qs_restrictions.
  */
 #define QUOTA_RESTRICT_NEEDSQUOTACHECK	0x1	/* quotacheck(8) required */
 #define QUOTA_RESTRICT_UNIFORMGRACE	0x2	/* grace time is global */
 #define QUOTA_RESTRICT_32BIT		0x4	/* values limited to 2^32 */
 /*
  * Structure for QUOTACTL_STAT.
  */
 struct quotastat {
 	char qs_implname[QUOTA_NAMELEN];
 	unsigned qs_numidtypes;
 	unsigned qs_numobjtypes;
-	unsigned qs_restrictions;
+	unsigned qs_restrictions;	/* semantic restriction codes */
 };
 /*
  * 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;