Module Name: src
Committed By: dholland
Date: Sun Jan 29 07:16:54 UTC 2012
Modified Files:
src/sys/ufs/ufs: quota2.h ufs_quota.c ufs_quota1.c ufs_quota2.c
ufs_vfsops.c
Log Message:
Remove references to <quota/quotaprop.h> in src/sys/ufs.
The remaining references in the kernel are in vfs_quotactl.c, the
compat_50 code for the old quotactl (to be fixed up), and the
code compiled from src/common/lib/libquota.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/ufs/quota2.h
cvs rdiff -u -r1.103 -r1.104 src/sys/ufs/ufs/ufs_quota.c
cvs rdiff -u -r1.15 -r1.16 src/sys/ufs/ufs/ufs_quota1.c
cvs rdiff -u -r1.26 -r1.27 src/sys/ufs/ufs/ufs_quota2.c
cvs rdiff -u -r1.47 -r1.48 src/sys/ufs/ufs/ufs_vfsops.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/quota2.h
diff -u src/sys/ufs/ufs/quota2.h:1.5 src/sys/ufs/ufs/quota2.h:1.6
--- src/sys/ufs/ufs/quota2.h:1.5 Tue Jun 7 14:56:13 2011
+++ src/sys/ufs/ufs/quota2.h Sun Jan 29 07:16:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2.h,v 1.5 2011/06/07 14:56:13 bouyer Exp $ */
+/* $NetBSD: quota2.h,v 1.6 2012/01/29 07:16:53 dholland Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -81,7 +81,10 @@ struct quota2_val {
#define N_QL 2
#define QL_BLOCK 0
#define QL_FILE 1
-#define INITQLNAMES {QUOTADICT_LTYPE_BLOCK, QUOTADICT_LTYPE_FILE}
+#define INITQLNAMES { \
+ [QL_BLOCK] = "block", \
+ [QL_FILE] = "file", \
+}
struct quota2_entry {
/* block & inode limits and status */
Index: src/sys/ufs/ufs/ufs_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.103 src/sys/ufs/ufs/ufs_quota.c:1.104
--- src/sys/ufs/ufs/ufs_quota.c:1.103 Sun Jan 29 07:14:38 2012
+++ src/sys/ufs/ufs/ufs_quota.c Sun Jan 29 07:16:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.c,v 1.103 2012/01/29 07:14:38 dholland Exp $ */
+/* $NetBSD: ufs_quota.c,v 1.104 2012/01/29 07:16:53 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.103 2012/01/29 07:14:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.104 2012/01/29 07:16:53 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,
#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/ufs_extern.h>
#include <ufs/ufs/ufs_quota.h>
-#include <quota/quotaprop.h>
kmutex_t dqlock;
kcondvar_t dqcv;
Index: src/sys/ufs/ufs/ufs_quota1.c
diff -u src/sys/ufs/ufs/ufs_quota1.c:1.15 src/sys/ufs/ufs/ufs_quota1.c:1.16
--- src/sys/ufs/ufs/ufs_quota1.c:1.15 Sun Jan 29 06:49:44 2012
+++ src/sys/ufs/ufs/ufs_quota1.c Sun Jan 29 07:16:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota1.c,v 1.15 2012/01/29 06:49:44 dholland Exp $ */
+/* $NetBSD: ufs_quota1.c,v 1.16 2012/01/29 07:16:53 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.15 2012/01/29 06:49:44 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.16 2012/01/29 07:16:53 dholland Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c
#include <sys/mount.h>
#include <sys/kauth.h>
-#include <quota/quotaprop.h>
#include <ufs/ufs/quota1.h>
#include <ufs/ufs/inode.h>
#include <ufs/ufs/ufsmount.h>
Index: src/sys/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.26 src/sys/ufs/ufs/ufs_quota2.c:1.27
--- src/sys/ufs/ufs/ufs_quota2.c:1.26 Sun Jan 29 07:09:52 2012
+++ src/sys/ufs/ufs/ufs_quota2.c Sun Jan 29 07:16:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.26 2012/01/29 07:09:52 dholland Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.27 2012/01/29 07:16:54 dholland Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.26 2012/01/29 07:09:52 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.27 2012/01/29 07:16:54 dholland Exp $");
#include <sys/buf.h>
#include <sys/param.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c
#include <ufs/ufs/ufs_extern.h>
#include <ufs/ufs/ufs_quota.h>
#include <ufs/ufs/ufs_wapbl.h>
-#include <quota/quotaprop.h>
/*
* LOCKING:
Index: src/sys/ufs/ufs/ufs_vfsops.c
diff -u src/sys/ufs/ufs/ufs_vfsops.c:1.47 src/sys/ufs/ufs/ufs_vfsops.c:1.48
--- src/sys/ufs/ufs/ufs_vfsops.c:1.47 Sun Jan 29 07:14:39 2012
+++ src/sys/ufs/ufs/ufs_vfsops.c Sun Jan 29 07:16:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vfsops.c,v 1.47 2012/01/29 07:14:39 dholland Exp $ */
+/* $NetBSD: ufs_vfsops.c,v 1.48 2012/01/29 07:16:54 dholland Exp $ */
/*
* Copyright (c) 1991, 1993, 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.47 2012/01/29 07:14:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.48 2012/01/29 07:16:54 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -63,7 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c
#ifdef UFS_DIRHASH
#include <ufs/ufs/dirhash.h>
#endif
-#include <quota/quotaprop.h>
/* how many times ufs_init() was called */
static int ufs_initcount = 0;
