makefs doesn't care about quotas.

3 files changed, 1 insertions, 184 deletions

diff --git a/usr.sbin/makefs/msdos/msdosfs_vfsops.c b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
index 25c128a1c97..c9340b949c9 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vfsops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vfsops.c,v 1.5 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: msdosfs_vfsops.c,v 1.6 2016/10/17 13:53:35 natano Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -337,14 +337,6 @@ msdosfs_mount(struct mkfsvnode *devvp, int flags)
 	else
 		pmp->pm_fmod = 1;
 
-	/*
-	 * If we ever do quotas for DOS filesystems this would be a place
-	 * to fill in the info in the msdosfsmount structure. You dolt,
-	 * quotas on dos filesystems make no sense because files have no
-	 * owners on dos filesystems. of course there is some empty space
-	 * in the directory entry where we could put uid's and gid's.
-	 */
-
 	return pmp;
 
 error_exit:
diff --git a/usr.sbin/makefs/sys/quota.h b/usr.sbin/makefs/sys/quota.h
deleted file mode 100644
index 09a0f47c83f..00000000000
--- a/usr.sbin/makefs/sys/quota.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $OpenBSD: quota.h,v 1.2 2016/10/16 20:26:56 natano Exp $ */
-/* $NetBSD: quota.h,v 1.12 2012/01/30 00:56:19 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 _SYS_QUOTA_H_
-#define _SYS_QUOTA_H_
-
-#include <sys/types.h>
-
-/* quota id types (entities being billed) */
-#define QUOTA_IDTYPE_USER	0
-#define QUOTA_IDTYPE_GROUP	1
-
-/* quota object types (things being limited) */
-#define QUOTA_OBJTYPE_BLOCKS	0
-#define QUOTA_OBJTYPE_FILES	1
-
-/* id value for "default" */
-#define QUOTA_DEFAULTID		((id_t)-1)
-
-/* limit value for "no limit" */
-#define QUOTA_NOLIMIT		((uint64_t)0xffffffffffffffffULL)
-
-/* time value for "no time" */
-#define QUOTA_NOTIME		((time_t)-1)
-
-/*
- * Semantic restrictions. These are hints applications can use
- * to help produce comprehensible error diagnostics when something
- * unsupported is attempted.
- */
-#define QUOTA_RESTRICT_NEEDSQUOTACHECK	0x1	/* quotacheck(8) required */
-#define QUOTA_RESTRICT_UNIFORMGRACE	0x2	/* grace time is global */
-#define QUOTA_RESTRICT_32BIT		0x4	/* values limited to 2^32 */
-#define QUOTA_RESTRICT_READONLY		0x8	/* updates not supported */
-
-
-/*
- * Structure used to describe the key part of a quota record.
- */
-struct quotakey {
-	int qk_idtype;		/* type of id (user, group, etc.) */
-	id_t qk_id;		/* actual id number */
-	int qk_objtype;		/* type of fs object (blocks, files, etc.) */
-};
-
-/*
- * Structure used to describe the value part of a quota record.
- */
-struct quotaval {
-        uint64_t qv_hardlimit;	/* absolute limit */
-	uint64_t qv_softlimit;	/* overflowable limit */
-	uint64_t qv_usage;	/* current usage */
-	time_t qv_expiretime;	/* time when softlimit grace expires */
-	time_t qv_grace;	/* allowed time for overflowing soft limit */
-};
-
-#endif /* _SYS_QUOTA_H_ */
diff --git a/usr.sbin/makefs/ufs/ufs/quota.h b/usr.sbin/makefs/ufs/ufs/quota.h
deleted file mode 100644
index f39d4150651..00000000000
--- a/usr.sbin/makefs/ufs/ufs/quota.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$OpenBSD: quota.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
-/*	$NetBSD: quota.h,v 1.30 2012/08/26 02:32:14 dholland Exp $	*/
-
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Robert Elz at The University of Melbourne.
- *
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)quota.h	8.3 (Berkeley) 8/19/94
- */
-
-#ifndef	_UFS_UFS_QUOTA_H_
-#define	_UFS_UFS_QUOTA_H_
-
-/*
- * These definitions are common to the original disk quota implementation
- * (quota1) and the newer implementation (quota2)
- */
-
-/*
- * The following constants define the usage of the quota file array in the
- * ufsmount structure and dquot array in the inode structure.  The semantics
- * of the elements of these arrays are defined in the routine getinoquota;
- * the remainder of the quota code treats them generically and need not be
- * inspected when changing the size of the array.
- */
-#define	MAXQUOTAS	2
-#define	USRQUOTA	0	/* element used for user quotas */
-#define	GRPQUOTA	1	/* element used for group quotas */
-
-/*
- * Initializer for the strings corresponding to the quota ID types.
- * (in quota1 these are also the default names of the quota files)
- */
-#define INITQFNAMES { \
-	"user",		/* USRQUOTA */ \
-	"group",	/* GRPQUOTA */ \
-}
-
-#include <sys/quota.h>
-__inline static int __unused
-quota_idtype_to_ufs(int idtype)
-{
-	switch (idtype) {
-	case QUOTA_IDTYPE_USER:
-		return USRQUOTA;
-	case QUOTA_IDTYPE_GROUP:
-		return GRPQUOTA;
-	default:
-		return -1;
-	}
-}
-
-static __inline int __unused
-quota_idtype_from_ufs(int ufstype)
-{
-	switch (ufstype) {
-	case USRQUOTA:
-		return QUOTA_IDTYPE_USER;
-	case GRPQUOTA:
-		return QUOTA_IDTYPE_GROUP;
-	default:
-		return -1;
-	}
-}
-
-#endif /* !_UFS_UFS_QUOTA_H_ */