Module Name: src
Committed By: dholland
Date: Sun Feb 5 14:19:06 UTC 2012
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/include: Makefile
src/sys/lib/libkern: Makefile.libkern
src/sys/ufs/ufs: quota2.h quota2_subr.c ufs_quota2.c
Removed Files:
src/common/include/quota: Makefile quota.h quotaprop.h
src/common/lib/libquota: Makefile.inc quotaprop.c quotasubr.c
Log Message:
Migrate one last leftover bit (used only by the kernel now) to
sys/ufs/ufs and remove the old quota headers and no-longer-used shared
code. Ok by releng.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/common/include/quota/Makefile
cvs rdiff -u -r1.5 -r0 src/common/include/quota/quota.h
cvs rdiff -u -r1.4 -r0 src/common/include/quota/quotaprop.h
cvs rdiff -u -r1.1 -r0 src/common/lib/libquota/Makefile.inc
cvs rdiff -u -r1.2 -r0 src/common/lib/libquota/quotaprop.c \
src/common/lib/libquota/quotasubr.c
cvs rdiff -u -r1.979 -r1.980 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1729 -r1.1730 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.137 -r1.138 src/include/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/ufs/quota2.h
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/ufs/quota2_subr.c
cvs rdiff -u -r1.32 -r1.33 src/sys/ufs/ufs/ufs_quota2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.979 src/distrib/sets/lists/base/mi:1.980
--- src/distrib/sets/lists/base/mi:1.979 Fri Feb 3 22:18:04 2012
+++ src/distrib/sets/lists/base/mi Sun Feb 5 14:19:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.979 2012/02/03 22:18:04 joerg Exp $
+# $NetBSD: mi,v 1.980 2012/02/05 14:19:04 dholland Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -889,7 +889,7 @@
./usr/include/ppath base-c-usr
./usr/include/prop base-c-usr
./usr/include/protocols base-c-usr
-./usr/include/quota base-c-usr
+./usr/include/quota base-obsolete obsolete
./usr/include/readline base-c-usr
./usr/include/rpc base-c-usr
./usr/include/rpcsvc base-c-usr
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1729 src/distrib/sets/lists/comp/mi:1.1730
--- src/distrib/sets/lists/comp/mi:1.1729 Wed Feb 1 05:34:38 2012
+++ src/distrib/sets/lists/comp/mi Sun Feb 5 14:19:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1729 2012/02/01 05:34:38 dholland Exp $
+# $NetBSD: mi,v 1.1730 2012/02/05 14:19:05 dholland Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2215,8 +2215,8 @@
./usr/include/puffsdump.h comp-puffs-include
./usr/include/pwd.h comp-c-include
./usr/include/quota.h comp-c-include
-./usr/include/quota/quota.h comp-c-include
-./usr/include/quota/quotaprop.h comp-c-include
+./usr/include/quota/quota.h comp-obsolete obsolete
+./usr/include/quota/quotaprop.h comp-obsolete obsolete
./usr/include/radlib.h comp-c-include
./usr/include/radlib_vs.h comp-c-include
./usr/include/randomid.h comp-c-include
Index: src/include/Makefile
diff -u src/include/Makefile:1.137 src/include/Makefile:1.138
--- src/include/Makefile:1.137 Mon Jan 9 15:19:45 2012
+++ src/include/Makefile Sun Feb 5 14:19:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2012/01/09 15:19:45 dholland Exp $
+# $NetBSD: Makefile,v 1.138 2012/02/05 14:19:02 dholland Exp $
# @(#)Makefile 8.2 (Berkeley) 1/4/94
# Doing a make includes builds /usr/include
@@ -45,7 +45,6 @@ INCSDIR= /usr/include
SUBDIR= rpc
SUBDIR+= ../common/include/prop
SUBDIR+= ../common/include/ppath
-SUBDIR+= ../common/include/quota
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.16 src/sys/lib/libkern/Makefile.libkern:1.17
--- src/sys/lib/libkern/Makefile.libkern:1.16 Fri Jan 20 00:25:29 2012
+++ src/sys/lib/libkern/Makefile.libkern Sun Feb 5 14:19:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.16 2012/01/20 00:25:29 joerg Exp $
+# $NetBSD: Makefile.libkern,v 1.17 2012/02/05 14:19:03 dholland Exp $
#
# Variable definitions for libkern.
@@ -33,7 +33,6 @@ CPPFLAGS+= -I$M ${KERNCPPFLAGS} ${KERNMI
.include "${.PARSEDIR}/../../../common/lib/libutil/Makefile.inc"
.include "${.PARSEDIR}/../../../common/lib/libprop/Makefile.inc"
.include "${.PARSEDIR}/../../../common/lib/libppath/Makefile.inc"
-.include "${.PARSEDIR}/../../../common/lib/libquota/Makefile.inc"
CPPFLAGS+= -I${KERNDIR}/../../../common/include
Index: src/sys/ufs/ufs/quota2.h
diff -u src/sys/ufs/ufs/quota2.h:1.8 src/sys/ufs/ufs/quota2.h:1.9
--- src/sys/ufs/ufs/quota2.h:1.8 Sun Jan 29 07:20:27 2012
+++ src/sys/ufs/ufs/quota2.h Sun Feb 5 14:19:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2.h,v 1.8 2012/01/29 07:20:27 dholland Exp $ */
+/* $NetBSD: quota2.h,v 1.9 2012/02/05 14:19:04 dholland Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -107,4 +107,21 @@ void quota2_create_blk0(uint64_t, void *
void quota2_ufs_rwq2v(const struct quota2_val *, struct quota2_val *, int);
void quota2_ufs_rwq2e(const struct quota2_entry *, struct quota2_entry *, int);
+/*
+ * Return codes for quota_check_limit()
+ */
+
+#define QL_S_ALLOW_OK 0x00 /* below soft limit */
+#define QL_S_ALLOW_SOFT 0x01 /* over soft limit */
+#define QL_S_DENY_GRACE 0x02 /* over soft limit, grace time expired */
+#define QL_S_DENY_HARD 0x03 /* over hard limit */
+
+#define QL_F_CROSS 0x80 /* crossing soft limit */
+
+#define QL_STATUS(x) ((x) & 0x0f)
+#define QL_FLAGS(x) ((x) & 0xf0)
+
+/* check a quota usage against limits (assumes UFS semantic) */
+int quota_check_limit(uint64_t, uint64_t, uint64_t, uint64_t, time_t, time_t);
+
#endif /* _UFS_UFS_QUOTA2_H_ */
Index: src/sys/ufs/ufs/quota2_subr.c
diff -u src/sys/ufs/ufs/quota2_subr.c:1.4 src/sys/ufs/ufs/quota2_subr.c:1.5
--- src/sys/ufs/ufs/quota2_subr.c:1.4 Tue Jun 7 14:56:13 2011
+++ src/sys/ufs/ufs/quota2_subr.c Sun Feb 5 14:19:04 2012
@@ -1,6 +1,6 @@
-/* $NetBSD: quota2_subr.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $ */
+/* $NetBSD: quota2_subr.c,v 1.5 2012/02/05 14:19:04 dholland Exp $ */
/*-
- * Copyright (c) 2010 Manuel Bouyer
+ * Copyright (c) 2010, 2011 Manuel Bouyer
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.5 2012/02/05 14:19:04 dholland Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -106,3 +106,22 @@ int needswap)
needswap);
d->q2e_uid = ufs_rw32(s->q2e_uid, needswap);
}
+
+int
+quota_check_limit(uint64_t cur, uint64_t change, uint64_t soft, uint64_t hard,
+ time_t expire, time_t now)
+{
+ if (cur + change > hard) {
+ if (cur <= soft)
+ return (QL_F_CROSS | QL_S_DENY_HARD);
+ return QL_S_DENY_HARD;
+ } else if (cur + change > soft) {
+ if (cur <= soft)
+ return (QL_F_CROSS | QL_S_ALLOW_SOFT);
+ if (now > expire) {
+ return QL_S_DENY_GRACE;
+ }
+ return QL_S_ALLOW_SOFT;
+ }
+ return QL_S_ALLOW_OK;
+}
Index: src/sys/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.32 src/sys/ufs/ufs/ufs_quota2.c:1.33
--- src/sys/ufs/ufs/ufs_quota2.c:1.32 Wed Feb 1 05:43:54 2012
+++ src/sys/ufs/ufs/ufs_quota2.c Sun Feb 5 14:19:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.32 2012/02/01 05:43:54 dholland Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.33 2012/02/05 14:19:04 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.32 2012/02/01 05:43:54 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.33 2012/02/05 14:19:04 dholland Exp $");
#include <sys/buf.h>
#include <sys/param.h>
@@ -51,8 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c
#include <ufs/ufs/ufs_quota.h>
#include <ufs/ufs/ufs_wapbl.h>
-#include <quota/quota.h> /* XXX for quota_check_limit */
-
/*
* LOCKING:
* Data in the entries are protected by the associated struct dquot's
