[src/netbsd-6]: src/sys/ufs/ufs Pull up following revision(s) (requested by d...

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

details:   https://anonhg.NetBSD.org/src/rev/c1404cf11b94
branches:  netbsd-6
changeset: 774370:c1404cf11b94
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jul 30 08:24:57 2012 +0000

description:
Pull up following revision(s) (requested by dholland in ticket #450):
        sys/ufs/ufs/ufs_quota.c: revision 1.110
        sys/ufs/ufs/ufs_quota.h: revision 1.21
        sys/ufs/ufs/ufs_quota.c: revision 1.109
Eliminate a common in a header file (add a missing extern) and
declare it in the approriate C file.
Restore accidentally lost initialization of quotatypes[].
Fixes (null) in the kernel message triggered when you go over quota, and
maybe other things. Reported by Matthew Mondor.

diffstat:

 sys/ufs/ufs/ufs_quota.c |  6 ++++--
 sys/ufs/ufs/ufs_quota.h |  4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r dc1bf5b3ba79 -r c1404cf11b94 sys/ufs/ufs/ufs_quota.c
--- a/sys/ufs/ufs/ufs_quota.c   Mon Jul 30 08:05:33 2012 +0000
+++ b/sys/ufs/ufs/ufs_quota.c   Mon Jul 30 08:24:57 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_quota.c,v 1.108 2012/02/01 05:43:54 dholland Exp $ */
+/*     $NetBSD: ufs_quota.c,v 1.108.2.1 2012/07/30 08:24:57 martin 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.108 2012/02/01 05:43:54 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.108.2.1 2012/07/30 08:24:57 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -52,6 +52,7 @@
 
 #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>
@@ -59,6 +60,7 @@
 
 kmutex_t dqlock;
 kcondvar_t dqcv;
+const char *quotatypes[MAXQUOTAS] = INITQFNAMES;
 
 /*
  * Code pertaining to management of the in-core dquot data structures.
diff -r dc1bf5b3ba79 -r c1404cf11b94 sys/ufs/ufs/ufs_quota.h
--- a/sys/ufs/ufs/ufs_quota.h   Mon Jul 30 08:05:33 2012 +0000
+++ b/sys/ufs/ufs/ufs_quota.h   Mon Jul 30 08:24:57 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_quota.h,v 1.20 2012/01/29 07:09:52 dholland Exp $  */
+/*     $NetBSD: ufs_quota.h,v 1.20.2.1 2012/07/30 08:24:57 martin Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -103,7 +103,7 @@
 /*
  * Quota name to error message mapping.
  */
-const char *quotatypes[MAXQUOTAS];
+extern const char *quotatypes[MAXQUOTAS];
 
 int  getinoquota(struct inode *);
 int  dqget(struct vnode *, u_long, struct ufsmount *, int, struct dquot **);