[src/trunk]: src/sys/ufs/ufs Restore accidentally lost initialization of quot...

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

details:   https://anonhg.NetBSD.org/src/rev/fff9e10e3fe7
branches:  trunk
changeset: 780558:fff9e10e3fe7
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jul 29 08:32:27 2012 +0000

description:
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 |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 86a9c1008d79 -r fff9e10e3fe7 sys/ufs/ufs/ufs_quota.c
--- a/sys/ufs/ufs/ufs_quota.c   Sun Jul 29 07:04:09 2012 +0000
+++ b/sys/ufs/ufs/ufs_quota.c   Sun Jul 29 08:32:27 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_quota.c,v 1.109 2012/02/18 06:13:23 matt Exp $     */
+/*     $NetBSD: ufs_quota.c,v 1.110 2012/07/29 08:32:27 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.109 2012/02/18 06:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.110 2012/07/29 08:32:27 dholland 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,7 +60,7 @@
 
 kmutex_t dqlock;
 kcondvar_t dqcv;
-const char *quotatypes[MAXQUOTAS];
+const char *quotatypes[MAXQUOTAS] = INITQFNAMES;
 
 /*
  * Code pertaining to management of the in-core dquot data structures.