Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Migrate one last leftover bit (used only by the kernel now) to
details: https://anonhg.NetBSD.org/src/rev/291d34cf6bc0
branches: trunk
changeset: 773538:291d34cf6bc0
user: dholland <dholland%NetBSD.org@localhost>
date: Sun Feb 05 14:19:02 2012 +0000
description:
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:
common/include/quota/Makefile | 6 -
common/include/quota/quota.h | 51 ---------
common/include/quota/quotaprop.h | 87 ---------------
common/lib/libquota/Makefile.inc | 4 -
common/lib/libquota/quotaprop.c | 214 ---------------------------------------
common/lib/libquota/quotasubr.c | 52 ---------
distrib/sets/lists/base/mi | 4 +-
distrib/sets/lists/comp/mi | 6 +-
include/Makefile | 3 +-
sys/lib/libkern/Makefile.libkern | 3 +-
sys/ufs/ufs/quota2.h | 19 +++-
sys/ufs/ufs/quota2_subr.c | 25 ++++-
sys/ufs/ufs/ufs_quota2.c | 6 +-
13 files changed, 49 insertions(+), 431 deletions(-)
diffs (truncated from 612 to 300 lines):
diff -r 400ba5d7a56c -r 291d34cf6bc0 common/include/quota/Makefile
--- a/common/include/quota/Makefile Sun Feb 05 14:14:44 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 400ba5d7a56c -r 291d34cf6bc0 common/include/quota/quota.h
--- a/common/include/quota/quota.h Sun Feb 05 14:14:44 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 400ba5d7a56c -r 291d34cf6bc0 common/include/quota/quotaprop.h
--- a/common/include/quota/quotaprop.h Sun Feb 05 14:14:44 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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_ */
diff -r 400ba5d7a56c -r 291d34cf6bc0 common/lib/libquota/Makefile.inc
--- a/common/lib/libquota/Makefile.inc Sun Feb 05 14:14:44 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/03/24 17:05:39 bouyer Exp $
-
-.PATH.c: ${.PARSEDIR}
-SRCS+= quotaprop.c quotasubr.c
diff -r 400ba5d7a56c -r 291d34cf6bc0 common/lib/libquota/quotaprop.c
--- a/common/lib/libquota/quotaprop.c Sun Feb 05 14:14:44 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-/* $NetBSD: quotaprop.c,v 1.2 2011/06/07 14:56:12 bouyer Exp $ */
-/*-
- * Copyright (c) 2011 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.
- */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/inttypes.h>
-#include <sys/errno.h>
-
-#include <quota/quotaprop.h>
-
-/*
- * update values from value[] using dict entries whose key is stored
- * in name[]. Unknown keys are ignored. If update is false,
- * a key in name[] but not in dict is an error.
- * name[] may have NULL pointers to skip a value[]
- */
-int
-quotaprop_dict_get_uint64(prop_dictionary_t dict, uint64_t value[],
- const char *name[], int nvalues, bool update)
-{
- int i;
- uint64_t v;
-
- for (i = 0; i < nvalues; i++) {
- if (name[i] == NULL)
- continue;
- if (!prop_dictionary_get_uint64(dict, name[i], &v)) {
- if (!update)
- return EINVAL;
- }
- value[i] = v;
- }
- return 0;
-}
-
-/*
- * convert a quota entry dictionary to in-memory array of uint64_t's
- */
-int
-proptoquota64(prop_dictionary_t data, uint64_t *values[], const char *valname[],
- int nvalues, const char *limname[], int nlimits)
-{
- int i, error;
- prop_dictionary_t val;
-
- for (i = 0; i < nlimits; i++) {
- if (limname[i] == NULL)
- continue;
- if (!prop_dictionary_get_dict(data, limname[i], &val))
- return EINVAL;
- error = quotaprop_dict_get_uint64(val, values[i],
- valname, nvalues, false);
- if (error)
- return error;
- }
- return 0;
-}
-
-int
-quota_get_cmds(prop_dictionary_t qdict, prop_array_t *cmds)
-{
- prop_number_t pn;
- prop_object_t o;
-
- pn = prop_dictionary_get(qdict, "interface version");
- if (pn == NULL)
- return EINVAL;
- if (prop_number_integer_value(pn) != 1)
- return EINVAL;
-
- o = prop_dictionary_get(qdict, "commands");
- if (o == NULL)
- return ENOMEM;
- if(prop_object_type(o) != PROP_TYPE_ARRAY)
- return EINVAL;
- *cmds = o;
- return 0;
-}
-
-
-prop_dictionary_t
-quota_prop_create(void)
-{
- prop_dictionary_t dict = prop_dictionary_create();
-
- if (dict == NULL)
- return NULL;
-
- if (!prop_dictionary_set_uint8(dict, "interface version", 1)) {
- goto err;
- }
- return dict;
-err:
- prop_object_release(dict);
- return NULL;
-}
-
-bool
-quota_prop_add_command(prop_array_t arrcmd, const char *cmd, const char *type,
- prop_array_t data)
-{
- prop_dictionary_t dict;
-
- dict = prop_dictionary_create();
- if (dict == NULL) {
- return false;
- }
- if (!prop_dictionary_set_cstring(dict, "type", type)) {
Home |
Main Index |
Thread Index |
Old Index