summaryrefslogtreecommitdiff
path: root/common/include
diff options
context:
space:
mode:
authordholland <dholland@NetBSD.org>2012-02-05 14:19:02 +0000
committerdholland <dholland@NetBSD.org>2012-02-05 14:19:02 +0000
commit7c87fd909deb2db56fb19d7daca6aa3d5f48eb99 (patch)
treed9b32d8312f96cbd8a8e226578a4e6154732aef5 /common/include
parent182f796ccf13520ddb9b4730ba47ebe027794961 (diff)
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.
Diffstat (limited to 'common/include')
-rw-r--r--common/include/quota/Makefile6
-rw-r--r--common/include/quota/quota.h51
-rw-r--r--common/include/quota/quotaprop.h87
3 files changed, 0 insertions, 144 deletions
diff --git a/common/include/quota/Makefile b/common/include/quota/Makefile
deleted file mode 100644
index 921bcba30e6..00000000000
--- a/common/include/quota/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2011/03/24 17:05:39 bouyer Exp $
-
-INCS= quotaprop.h quota.h
-INCSDIR= /usr/include/quota
-
-.include <bsd.prog.mk>
diff --git a/common/include/quota/quota.h b/common/include/quota/quota.h
deleted file mode 100644
index 8f99c18320f..00000000000
--- a/common/include/quota/quota.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $NetBSD: quota.h,v 1.5 2012/02/01 17:52:07 dholland Exp $ */
-/*-
- * Copyright (c) 2010 Manuel Bouyer
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _QUOTA_QUOTA_H_
-#define _QUOTA_QUOTA_H_
-
-#include <sys/types.h>
-#include <sys/quota.h>
-
-/*
- * 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 /* _QUOTA_QUOTA_H_ */
diff --git a/common/include/quota/quotaprop.h b/common/include/quota/quotaprop.h
deleted file mode 100644
index a35b6e5d9d3..00000000000
--- a/common/include/quota/quotaprop.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* $NetBSD: quotaprop.h,v 1.4 2012/02/01 05:34:38 dholland Exp $ */
-/*-
- * Copyright (c) 2010 Manuel Bouyer
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _QUOTA_QUOTAPROP_H_
-#define _QUOTA_QUOTAPROP_H_
-
-#include <prop/proplib.h>
-
-/* strings used in dictionary for the different quota class */
-#define QUOTADICT_CLASS_USER "user"
-#define QUOTADICT_CLASS_GROUP "group"
-
-/* strings used in dictionary for the different limit types */
-#define QUOTADICT_LTYPE_BLOCK "block"
-#define QUOTADICT_LTYPE_FILE "file"
-
-/* strings used in dictionary for the different limit and usage values */
-#define QUOTADICT_LIMIT_SOFT "soft"
-#define QUOTADICT_LIMIT_HARD "hard"
-#define QUOTADICT_LIMIT_GTIME "grace time"
-#define QUOTADICT_LIMIT_USAGE "usage"
-#define QUOTADICT_LIMIT_ETIME "expire time"
-
-/* array of strings for the above */
-#define UFS_QUOTA_ENTRY_NAMES \
- {QUOTADICT_LIMIT_HARD, \
- QUOTADICT_LIMIT_SOFT, \
- QUOTADICT_LIMIT_USAGE, \
- QUOTADICT_LIMIT_ETIME, \
- QUOTADICT_LIMIT_GTIME \
- }
-#define UFS_QUOTA_NENTRIES 5
-extern const char *ufs_quota_entry_names[];
-
-/* array of strings for limit types and associated #define */
-extern const char *ufs_quota_limit_names[];
-#define QUOTA_LIMIT_BLOCK 0
-#define QUOTA_LIMIT_FILE 1
-#define QUOTA_NLIMITS 2
-#define QUOTA_LIMIT_NAMES { QUOTADICT_LTYPE_BLOCK, QUOTADICT_LTYPE_FILE }
-
-/* array of strings for quota class and associated #define */
-extern const char *ufs_quota_class_names[];
-#define QUOTA_CLASS_USER 0
-#define QUOTA_CLASS_GROUP 1
-#define QUOTA_NCLASS 2
-#define QUOTA_CLASS_NAMES { QUOTADICT_CLASS_USER, QUOTADICT_CLASS_GROUP }
-
-int quotaprop_dict_get_uint64(prop_dictionary_t, uint64_t[],
- const char *[], int, bool);
-int proptoquota64(prop_dictionary_t, uint64_t *[], const char *[], int,
- const char *[], int);
-
-int quota_get_cmds(prop_dictionary_t, prop_array_t *);
-prop_dictionary_t quota_prop_create(void);
-bool quota_prop_add_command(prop_array_t, const char *, const char *,
- prop_array_t);
-
-prop_dictionary_t limits64toprop(uint64_t[], const char *[], int);
-prop_dictionary_t quota64toprop(uid_t, int, uint64_t *[], const char *[], int,
- const char *[], int);
-
-#endif /* _QUOTA_QUOTAPROP_H_ */