Module Name: src
Committed By: dholland
Date: Sun Aug 26 02:32:14 UTC 2012
Modified Files:
src/sys/ufs/ufs: quota.h quota1.h ufs_quota.c
Log Message:
Move INITQFNAMES to the right header file.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/ufs/ufs/quota.h
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/ufs/quota1.h
cvs rdiff -u -r1.110 -r1.111 src/sys/ufs/ufs/ufs_quota.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ufs/quota.h
diff -u src/sys/ufs/ufs/quota.h:1.29 src/sys/ufs/ufs/quota.h:1.30
--- src/sys/ufs/ufs/quota.h:1.29 Sun Jan 29 07:16:00 2012
+++ src/sys/ufs/ufs/quota.h Sun Aug 26 02:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.h,v 1.29 2012/01/29 07:16:00 dholland Exp $ */
+/* $NetBSD: quota.h,v 1.30 2012/08/26 02:32:14 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -53,6 +53,14 @@
#define USRQUOTA 0 /* element used for user quotas */
#define GRPQUOTA 1 /* element used for group quotas */
+/*
+ * Initializer for the strings corresponding to the quota ID types.
+ * (in quota1 these are also the default names of the quota files)
+ */
+#define INITQFNAMES { \
+ "user", /* USRQUOTA */ \
+ "group", /* GRPQUOTA */ \
+}
#if !defined(HAVE_NBTOOL_CONFIG_H)
#include <sys/quota.h>
Index: src/sys/ufs/ufs/quota1.h
diff -u src/sys/ufs/ufs/quota1.h:1.6 src/sys/ufs/ufs/quota1.h:1.7
--- src/sys/ufs/ufs/quota1.h:1.6 Sun Jan 29 06:23:20 2012
+++ src/sys/ufs/ufs/quota1.h Sun Aug 26 02:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota1.h,v 1.6 2012/01/29 06:23:20 dholland Exp $ */
+/* $NetBSD: quota1.h,v 1.7 2012/08/26 02:32:14 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -47,14 +47,6 @@
*/
/*
- * Definitions for the default names of the quotas files/quota types.
- */
-#define INITQFNAMES { \
- "user", /* USRQUOTA */ \
- "group", /* GRPQUOTA */ \
-}
-
-/*
* Definitions for disk quotas imposed on the average user
* (big brother finally hits UNIX).
*
Index: src/sys/ufs/ufs/ufs_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.110 src/sys/ufs/ufs/ufs_quota.c:1.111
--- src/sys/ufs/ufs/ufs_quota.c:1.110 Sun Jul 29 08:32:27 2012
+++ src/sys/ufs/ufs/ufs_quota.c Sun Aug 26 02:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.c,v 1.110 2012/07/29 08:32:27 dholland Exp $ */
+/* $NetBSD: ufs_quota.c,v 1.111 2012/08/26 02:32:14 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.110 2012/07/29 08:32:27 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.111 2012/08/26 02:32:14 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,
#include <sys/quotactl.h>
#include <ufs/ufs/quota.h>
-#include <ufs/ufs/quota1.h> /* for INITQFNAMES; should be moved to quota.h */
#include <ufs/ufs/inode.h>
#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/ufs_extern.h>
