Module Name: src Committed By: dholland Date: Sun Jul 29 08:32:27 UTC 2012
Modified Files: src/sys/ufs/ufs: ufs_quota.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 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/ufs_quota.c diff -u src/sys/ufs/ufs/ufs_quota.c:1.109 src/sys/ufs/ufs/ufs_quota.c:1.110 --- src/sys/ufs/ufs/ufs_quota.c:1.109 Sat Feb 18 06:13:23 2012 +++ src/sys/ufs/ufs/ufs_quota.c Sun Jul 29 08:32:27 2012 @@ -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 @@ __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> @@ -59,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_quota.c, 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.