Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
dholland 2012-01-29 07:16:53 +00:00
parent f0f8fe3be2
commit 37dccadd0f
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/ufs/ufs/quota2.h
View File

@ -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 */

5
sys/ufs/ufs/ufs_quota.c
View File

@ -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,v 1.103 2012/01/29 07:14:38 dholland Exp
#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;

5
sys/ufs/ufs/ufs_quota1.c
View File

@ -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,v 1.15 2012/01/29 06:49:44 dholland Exp
#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>

5
sys/ufs/ufs/ufs_quota2.c
View File

@ -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,v 1.26 2012/01/29 07:09:52 dholland Exp
#include <ufs/ufs/ufs_extern.h>
#include <ufs/ufs/ufs_quota.h>
#include <ufs/ufs/ufs_wapbl.h>
#include <quota/quotaprop.h>
/*
* LOCKING:

5
sys/ufs/ufs/ufs_vfsops.c
View File

@ -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,v 1.47 2012/01/29 07:14:39 dholland Exp
#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;