diff options
| author | bouyer <bouyer@NetBSD.org> | 2011-03-06 17:08:10 +0000 |
|---|---|---|
| committer | bouyer <bouyer@NetBSD.org> | 2011-03-06 17:08:10 +0000 |
| commit | 0367ea04357cc3132acde34301e004c31404e00a (patch) | |
| tree | fbee7a75c9221f005c8e599dca212da52915cbe2 /sys/arch/sun2 | |
| parent | e6c5a781a6101ca215918815f4f048df623ddf85 (diff) | |
merge the bouyer-quota2 branch. This adds a new on-disk format
to store disk quota usage and limits, integrated with ffs
metadata. Usage is checked by fsck_ffs (no more quotacheck)
and is covered by the WAPBL journal. Enabled with kernel
option QUOTA2 (added where QUOTA was enabled in kernel config files),
turned on with tunefs(8) on a per-filesystem
basis. mount_mfs(8) can also turn quotas on.
See http://mail-index.netbsd.org/tech-kern/2011/02/19/msg010025.html
for details.
Diffstat (limited to 'sys/arch/sun2')
| -rw-r--r-- | sys/arch/sun2/conf/DISKLESS | 7 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/FOURMEG | 7 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/INSTALL | 7 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/VME | 7 |
6 files changed, 23 insertions, 17 deletions
diff --git a/sys/arch/sun2/conf/DISKLESS b/sys/arch/sun2/conf/DISKLESS index 0ac5a9a198e..729c070ed1f 100644 --- a/sys/arch/sun2/conf/DISKLESS +++ b/sys/arch/sun2/conf/DISKLESS @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.42 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: DISKLESS,v 1.43 2011/03/06 17:08:32 bouyer Exp $ # DISKLESS Sun2 (2/120, 2/170, 2/50, ...) # Supports root on: ie0, ec0 @@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "DISKLESS-$Revision: 1.42 $" +#ident "DISKLESS-$Revision: 1.43 $" makeoptions COPTS="-Os" # optimize for size @@ -69,7 +69,8 @@ file-system MFS # memory-based filesystem file-system PTYFS # /dev/pts/N support #options NFSSERVER # nfs server support -#options QUOTA # FFS quotas +#options QUOTA # legacy UFS quotas +#options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independant support #options NFS_V2_ONLY # Exclude NFS3 code to save space diff --git a/sys/arch/sun2/conf/FOURMEG b/sys/arch/sun2/conf/FOURMEG index 4fd097d416f..b945258adc1 100644 --- a/sys/arch/sun2/conf/FOURMEG +++ b/sys/arch/sun2/conf/FOURMEG @@ -1,4 +1,4 @@ -# $NetBSD: FOURMEG,v 1.46 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: FOURMEG,v 1.47 2011/03/06 17:08:32 bouyer Exp $ # FOURMEG Sun2 (2/120, 2/170, 2/50, ...) # Supports root on: ie0, sd*, ... @@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "FOURMEG-$Revision: 1.46 $" +#ident "FOURMEG-$Revision: 1.47 $" makeoptions COPTS="-Os" # optimize for size @@ -69,7 +69,8 @@ file-system CD9660 # ISO 9660 + Rock Ridge file system #file-system PTYFS # /dev/pts/N support #options NFSSERVER # nfs server support -#options QUOTA # FFS quotas +#options QUOTA # legacy UFS quotas +#options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independant support #options NFS_V2_ONLY # Exclude NFS3 code to save space options FFS_NO_SNAPSHOT # No FFS snapshot support diff --git a/sys/arch/sun2/conf/GENERIC b/sys/arch/sun2/conf/GENERIC index 22dc753b065..6388f3b7564 100644 --- a/sys/arch/sun2/conf/GENERIC +++ b/sys/arch/sun2/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.76 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: GENERIC,v 1.77 2011/03/06 17:08:32 bouyer Exp $ # # GENERIC machine description file # @@ -25,7 +25,7 @@ include "arch/sun2/conf/std.sun2" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.76 $" +#ident "GENERIC-$Revision: 1.77 $" makeoptions COPTS="-Os" # optimize for size @@ -96,7 +96,8 @@ file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system options NFSSERVER # nfs server support -#options QUOTA # FFS quotas +#options QUOTA # legacy UFS quotas +#options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independant support options WAPBL # File system journaling support - Experimental #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental diff --git a/sys/arch/sun2/conf/INSTALL b/sys/arch/sun2/conf/INSTALL index 0795725f428..478686efe3b 100644 --- a/sys/arch/sun2/conf/INSTALL +++ b/sys/arch/sun2/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.39 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: INSTALL,v 1.40 2011/03/06 17:08:32 bouyer Exp $ # INSTALL Sun2 (2/120, 2/170, 2/50, ...) @@ -6,7 +6,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "INSTALL-$Revision: 1.39 $" +#ident "INSTALL-$Revision: 1.40 $" makeoptions COPTS="-Os" # optimize for size @@ -64,7 +64,8 @@ file-system KERNFS # /kern #file-system PTYFS # /dev/pts/N support #options NFSSERVER # nfs server support -#options QUOTA # FFS quotas +#options QUOTA # legacy UFS quotas +#options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independant support options NFS_V2_ONLY # Exclude NFS3 code to save space options FFS_NO_SNAPSHOT # No FFS snapshot support diff --git a/sys/arch/sun2/conf/RAMDISK b/sys/arch/sun2/conf/RAMDISK index 24a6365d6ca..3665c9ae02a 100644 --- a/sys/arch/sun2/conf/RAMDISK +++ b/sys/arch/sun2/conf/RAMDISK @@ -1,4 +1,4 @@ -# $NetBSD: RAMDISK,v 1.46 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: RAMDISK,v 1.47 2011/03/06 17:08:32 bouyer Exp $ # RAMDISK: Root/swap on ramdisk # This kernel is used to: @@ -69,7 +69,8 @@ file-system CD9660 # ISO 9660 + Rock Ridge file system #file-system PTYFS # /dev/pts/N support #options NFSSERVER # nfs server support -#options QUOTA # FFS quotas +#options QUOTA # legacy UFS quotas +#options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independant support options NFS_V2_ONLY # Exclude NFS3 code to save space options FFS_NO_SNAPSHOT # No FFS snapshot support diff --git a/sys/arch/sun2/conf/VME b/sys/arch/sun2/conf/VME index 4384cb9dc55..e9e927d6130 100644 --- a/sys/arch/sun2/conf/VME +++ b/sys/arch/sun2/conf/VME @@ -1,4 +1,4 @@ -# $NetBSD: VME,v 1.37 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: VME,v 1.38 2011/03/06 17:08:32 bouyer Exp $ # VME Sun2 (2/50, 2/130, 2/160...) # Supports root on: ie0, sd*, ... @@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "VME-$Revision: 1.37 $" +#ident "VME-$Revision: 1.38 $" # Machines to be supported by this kernel #options FPU_EMULATE @@ -71,7 +71,8 @@ file-system MFS # memory-based filesystem file-system PTYFS # /dev/pts/N support options NFSSERVER # nfs server support -#options QUOTA # FFS quotas +#options QUOTA # legacy UFS quotas +#options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independant support #options NFS_V2_ONLY # Exclude NFS3 code to save space options FFS_NO_SNAPSHOT # No FFS snapshot support |
