[src/bouyer-quota2]: src/sys/ufs/ufs Rename defininition for limits Q2V_* to ...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/270da3b636f7
branches:  bouyer-quota2
changeset: 761098:270da3b636f7
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Jan 31 15:19:21 2011 +0000

description:
Rename defininition for limits Q2V_* to QL_* and move from quota2.h to quota.h.

diffstat:

 sys/ufs/ufs/quota.h  |  14 ++++++++++++--
 sys/ufs/ufs/quota2.h |   9 ++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diffs (64 lines):

diff -r 92012ad7735b -r 270da3b636f7 sys/ufs/ufs/quota.h
--- a/sys/ufs/ufs/quota.h       Sun Jan 30 23:04:52 2011 +0000
+++ b/sys/ufs/ufs/quota.h       Mon Jan 31 15:19:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: quota.h,v 1.25.64.1 2011/01/20 14:25:03 bouyer Exp $   */
+/*     $NetBSD: quota.h,v 1.25.64.2 2011/01/31 15:19:21 bouyer Exp $   */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -54,13 +54,23 @@
 #define        GRPQUOTA        1       /* element used for group quotas */
 
 /*
- * Definitions for the default names of the quotas files.
+ * Definitions for the default names of the quotas files/quota types.
  */
 #define INITQFNAMES { \
        "user",         /* USRQUOTA */ \
        "group",        /* GRPQUOTA */ \
        "undefined", \
 }
+
+/* definition of limits types for each quota */
+#define QL_BLOCK 0
+#define QL_FILE  1
+#define N_QL     2
+
+#define INITQLNAMES  {"block", "file", "undefined" }
+
+
+
 #ifdef _KERNEL
 
 #include <sys/cdefs.h>
diff -r 92012ad7735b -r 270da3b636f7 sys/ufs/ufs/quota2.h
--- a/sys/ufs/ufs/quota2.h      Sun Jan 30 23:04:52 2011 +0000
+++ b/sys/ufs/ufs/quota2.h      Mon Jan 31 15:19:21 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2.h,v 1.1.2.4 2011/01/29 23:22:00 bouyer Exp $ */
+/* $NetBSD: quota2.h,v 1.1.2.5 2011/01/31 15:19:21 bouyer Exp $ */
 /*-
   * Copyright (c) 2010 Manuel Bouyer
   * All rights reserved.
@@ -55,11 +55,6 @@
        int64_t q2v_time; /* grace expiration date for softlimit overflow */
        int64_t q2v_grace; /* allowed time for softlimit overflow */
 };
-#define Q2V_BLOCK 0
-#define Q2V_FILE  1
-#define NQ2V      2
-
-#define QUOTA2_VALNAMES_INIT {"block", "file"}
 
 /*
  * Description of a user or group quota
@@ -69,7 +64,7 @@
 
 struct quota2_entry {
        /* block & inode limits and status */
-       struct quota2_val q2e_val[NQ2V];
+       struct quota2_val q2e_val[N_QL];
        /* pointer to next entry for this list (offset in the file) */
        uint64_t q2e_next;
        /* ownerchip information */