summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorbouyer <bouyer@NetBSD.org>2011-03-06 17:08:10 +0000
committerbouyer <bouyer@NetBSD.org>2011-03-06 17:08:10 +0000
commit0367ea04357cc3132acde34301e004c31404e00a (patch)
treefbee7a75c9221f005c8e599dca212da52915cbe2 /sys/arch
parente6c5a781a6101ca215918815f4f048df623ddf85 (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')
-rw-r--r--sys/arch/acorn26/conf/FOURMEG5
-rw-r--r--sys/arch/acorn26/conf/GENERIC5
-rw-r--r--sys/arch/acorn26/conf/INSTALL5
-rw-r--r--sys/arch/acorn32/conf/EB7500ATX7
-rw-r--r--sys/arch/acorn32/conf/GENERIC7
-rw-r--r--sys/arch/acorn32/conf/INSTALL7
-rw-r--r--sys/arch/acorn32/conf/LOWMEM_WSCONS5
-rw-r--r--sys/arch/acorn32/conf/NC5
-rw-r--r--sys/arch/alpha/conf/GENERIC7
-rw-r--r--sys/arch/amd64/conf/GENERIC7
-rw-r--r--sys/arch/amd64/conf/XEN3_DOM05
-rw-r--r--sys/arch/amd64/conf/XEN3_DOMU5
-rw-r--r--sys/arch/amiga/conf/DRACO7
-rw-r--r--sys/arch/amiga/conf/GENERIC7
-rw-r--r--sys/arch/amiga/conf/GENERIC.in7
-rw-r--r--sys/arch/amigappc/conf/GENERIC7
-rw-r--r--sys/arch/amigappc/conf/NULL7
-rw-r--r--sys/arch/arc/conf/ARCTIC5
-rw-r--r--sys/arch/arc/conf/GENERIC7
-rw-r--r--sys/arch/arc/conf/M4035
-rw-r--r--sys/arch/arc/conf/MIMORI5
-rw-r--r--sys/arch/arc/conf/PICA5
-rw-r--r--sys/arch/arc/conf/RAMDISK3
-rw-r--r--sys/arch/arc/conf/RPC447
-rw-r--r--sys/arch/atari/conf/GENERIC.in5
-rw-r--r--sys/arch/bebox/conf/GENERIC7
-rw-r--r--sys/arch/cats/conf/GENERIC5
-rw-r--r--sys/arch/cats/conf/INSTALL5
-rw-r--r--sys/arch/cesfic/conf/GENERIC5
-rw-r--r--sys/arch/cobalt/conf/GENERIC7
-rw-r--r--sys/arch/cobalt/conf/INSTALL7
-rw-r--r--sys/arch/dreamcast/conf/GENERIC5
-rw-r--r--sys/arch/emips/conf/GENERIC7
-rw-r--r--sys/arch/evbarm/conf/ADI_BRH5
-rw-r--r--sys/arch/evbarm/conf/ARMADILLO2105
-rw-r--r--sys/arch/evbarm/conf/ARMADILLO95
-rw-r--r--sys/arch/evbarm/conf/BEAGLEBOARD5
-rw-r--r--sys/arch/evbarm/conf/CP31005
-rw-r--r--sys/arch/evbarm/conf/GEMINI3
-rw-r--r--sys/arch/evbarm/conf/GEMINI_MASTER3
-rw-r--r--sys/arch/evbarm/conf/GEMINI_SLAVE3
-rw-r--r--sys/arch/evbarm/conf/GUMSTIX5
-rw-r--r--sys/arch/evbarm/conf/HDL_G5
-rw-r--r--sys/arch/evbarm/conf/IGEPV25
-rw-r--r--sys/arch/evbarm/conf/IMX31LITE5
-rw-r--r--sys/arch/evbarm/conf/INTEGRATOR5
-rw-r--r--sys/arch/evbarm/conf/IQ312445
-rw-r--r--sys/arch/evbarm/conf/IQ803105
-rw-r--r--sys/arch/evbarm/conf/IQ803215
-rw-r--r--sys/arch/evbarm/conf/IXDP4255
-rw-r--r--sys/arch/evbarm/conf/IXM12005
-rw-r--r--sys/arch/evbarm/conf/LUBBOCK3
-rw-r--r--sys/arch/evbarm/conf/MARVELL_NAS5
-rw-r--r--sys/arch/evbarm/conf/MPCSA_GENERIC7
-rw-r--r--sys/arch/evbarm/conf/NAPPI5
-rw-r--r--sys/arch/evbarm/conf/NETWALKER5
-rw-r--r--sys/arch/evbarm/conf/NSLU25
-rw-r--r--sys/arch/evbarm/conf/OSK59123
-rw-r--r--sys/arch/evbarm/conf/OVERO5
-rw-r--r--sys/arch/evbarm/conf/SHEEVAPLUG5
-rw-r--r--sys/arch/evbarm/conf/SMDK24105
-rw-r--r--sys/arch/evbarm/conf/SMDK28005
-rw-r--r--sys/arch/evbarm/conf/TEAMASA_NPWR5
-rw-r--r--sys/arch/evbarm/conf/TEAMASA_NPWR_FC5
-rw-r--r--sys/arch/evbarm/conf/TISDP24205
-rw-r--r--sys/arch/evbarm/conf/TISDP24305
-rw-r--r--sys/arch/evbarm/conf/TS72005
-rw-r--r--sys/arch/evbarm/conf/TWINTAIL5
-rw-r--r--sys/arch/evbarm/conf/VIPER5
-rw-r--r--sys/arch/evbarm/conf/ZAO4255
-rw-r--r--sys/arch/evbmips/conf/ADM51207
-rw-r--r--sys/arch/evbmips/conf/ADM5120-NB7
-rw-r--r--sys/arch/evbmips/conf/ADM5120-USB7
-rw-r--r--sys/arch/evbmips/conf/ALCHEMY7
-rw-r--r--sys/arch/evbmips/conf/AP307
-rw-r--r--sys/arch/evbmips/conf/GDIUM7
-rw-r--r--sys/arch/evbmips/conf/MALTA7
-rw-r--r--sys/arch/evbmips/conf/MERAKI7
-rw-r--r--sys/arch/evbmips/conf/RB1537
-rw-r--r--sys/arch/evbmips/conf/WGT624V37
-rw-r--r--sys/arch/evbppc/conf/EV642605
-rw-r--r--sys/arch/evbppc/conf/EXPLORA4515
-rw-r--r--sys/arch/evbppc/conf/MPC8536DS7
-rw-r--r--sys/arch/evbppc/conf/MPC8548CDS7
-rw-r--r--sys/arch/evbppc/conf/OPENBLOCKS2005
-rw-r--r--sys/arch/evbppc/conf/OPENBLOCKS2667
-rw-r--r--sys/arch/evbppc/conf/OPENBLOCKS6007
-rw-r--r--sys/arch/evbppc/conf/PMPPC5
-rw-r--r--sys/arch/evbppc/conf/RB8007
-rw-r--r--sys/arch/evbppc/conf/VIRTEX_DFC5
-rw-r--r--sys/arch/evbppc/conf/VIRTEX_GSRD15
-rw-r--r--sys/arch/evbppc/conf/VIRTEX_GSRD25
-rw-r--r--sys/arch/evbppc/conf/WALNUT5
-rw-r--r--sys/arch/ews4800mips/conf/GENERIC7
-rw-r--r--sys/arch/ews4800mips/conf/RAMDISK3
-rw-r--r--sys/arch/hp300/conf/GENERIC7
-rw-r--r--sys/arch/hp300/conf/INSTALL5
-rw-r--r--sys/arch/hp300/dev/hyperreg.h3
-rw-r--r--sys/arch/hp700/conf/GENERIC7
-rw-r--r--sys/arch/hpcarm/conf/IPAQ5
-rw-r--r--sys/arch/hpcarm/conf/JORNADA7207
-rw-r--r--sys/arch/hpcarm/conf/JORNADA8207
-rw-r--r--sys/arch/hpcarm/conf/WZERO37
-rw-r--r--sys/arch/hpcmips/conf/GENERIC7
-rw-r--r--sys/arch/hpcmips/conf/LROUTER5
-rw-r--r--sys/arch/hpcmips/conf/MPC3037
-rw-r--r--sys/arch/hpcmips/conf/TX39125
-rw-r--r--sys/arch/hpcmips/conf/TX39225
-rw-r--r--sys/arch/hpcmips/conf/VR41XX7
-rw-r--r--sys/arch/i386/conf/ALL7
-rw-r--r--sys/arch/i386/conf/GENERIC7
-rw-r--r--sys/arch/i386/conf/GENERIC_TINY5
-rw-r--r--sys/arch/i386/conf/INSTALL_FLOPPY5
-rw-r--r--sys/arch/i386/conf/INSTALL_TINY5
-rw-r--r--sys/arch/i386/conf/MONOLITHIC5
-rw-r--r--sys/arch/i386/conf/NET45017
-rw-r--r--sys/arch/i386/conf/XEN3_DOM05
-rw-r--r--sys/arch/i386/conf/XEN3_DOMU5
-rw-r--r--sys/arch/iyonix/conf/GENERIC7
-rw-r--r--sys/arch/landisk/conf/GENERIC7
-rw-r--r--sys/arch/luna68k/conf/GENERIC7
-rw-r--r--sys/arch/mac68k/conf/GENERIC7
-rw-r--r--sys/arch/mac68k/conf/SMALLRAM3
-rw-r--r--sys/arch/macppc/conf/GENERIC7
-rw-r--r--sys/arch/macppc/conf/MAMBO5
-rw-r--r--sys/arch/macppc/conf/POWERMAC_G53
-rw-r--r--sys/arch/mipsco/conf/GENERIC5
-rw-r--r--sys/arch/mipsco/conf/RC32305
-rw-r--r--sys/arch/mmeye/conf/GENERIC7
-rw-r--r--sys/arch/mmeye/conf/MMTA5
-rw-r--r--sys/arch/mmeye/conf/MMTAICE5
-rw-r--r--sys/arch/mmeye/conf/MMTAROMNEW5
-rw-r--r--sys/arch/mvmeppc/conf/GENERIC7
-rw-r--r--sys/arch/netwinder/conf/GENERIC5
-rw-r--r--sys/arch/news68k/conf/GENERIC7
-rw-r--r--sys/arch/news68k/conf/GENERIC_TINY7
-rw-r--r--sys/arch/news68k/conf/INSTALL5
-rw-r--r--sys/arch/news68k/conf/LIBERO5
-rw-r--r--sys/arch/news68k/conf/NEWS12005
-rw-r--r--sys/arch/newsmips/conf/GENERIC7
-rw-r--r--sys/arch/next68k/conf/GENERIC7
-rw-r--r--sys/arch/next68k/conf/SLAB5
-rw-r--r--sys/arch/ofppc/conf/GENERIC7
-rw-r--r--sys/arch/ofppc/conf/GENERIC.MP7
-rw-r--r--sys/arch/pmax/conf/GENERIC7
-rw-r--r--sys/arch/pmax/conf/GENERIC647
-rw-r--r--sys/arch/prep/conf/GENERIC7
-rw-r--r--sys/arch/rs6000/conf/GENERIC7
-rw-r--r--sys/arch/sandpoint/conf/GENERIC7
-rw-r--r--sys/arch/sbmips/conf/GENERIC7
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP127
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP2x7
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP3x7
-rw-r--r--sys/arch/shark/conf/GENERIC7
-rw-r--r--sys/arch/shark/conf/INSTALL5
-rw-r--r--sys/arch/shark/conf/OFWGENCFG5
-rw-r--r--sys/arch/sparc/conf/BILL-THE-CAT5
-rw-r--r--sys/arch/sparc/conf/INSTALL5
-rw-r--r--sys/arch/sparc/conf/KRUPS7
-rw-r--r--sys/arch/sparc/conf/MRCOFFEE7
-rw-r--r--sys/arch/sparc/conf/TADPOLE3GX5
-rw-r--r--sys/arch/sparc64/conf/GENERIC7
-rw-r--r--sys/arch/sparc64/conf/NONPLUS647
-rw-r--r--sys/arch/sun2/conf/DISKLESS7
-rw-r--r--sys/arch/sun2/conf/FOURMEG7
-rw-r--r--sys/arch/sun2/conf/GENERIC7
-rw-r--r--sys/arch/sun2/conf/INSTALL7
-rw-r--r--sys/arch/sun2/conf/RAMDISK5
-rw-r--r--sys/arch/sun2/conf/VME7
-rw-r--r--sys/arch/sun3/conf/DISKLESS5
-rw-r--r--sys/arch/sun3/conf/DISKLESS3X5
-rw-r--r--sys/arch/sun3/conf/GENERIC7
-rw-r--r--sys/arch/sun3/conf/GENERIC3X7
-rw-r--r--sys/arch/sun3/conf/INSTALL5
-rw-r--r--sys/arch/sun3/conf/INSTALL3X5
-rw-r--r--sys/arch/vax/conf/GENERIC7
-rw-r--r--sys/arch/vax/conf/INSTALL5
-rw-r--r--sys/arch/vax/conf/VAX7805
-rw-r--r--sys/arch/x68k/conf/GENERIC7
-rw-r--r--sys/arch/x68k/conf/INSTALL7
-rw-r--r--sys/arch/zaurus/conf/GENERIC5
181 files changed, 613 insertions, 434 deletions
diff --git a/sys/arch/acorn26/conf/FOURMEG b/sys/arch/acorn26/conf/FOURMEG
index ec0a8579ecf..2f6af26ba88 100644
--- a/sys/arch/acorn26/conf/FOURMEG
+++ b/sys/arch/acorn26/conf/FOURMEG
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.37 2010/11/23 11:13:52 hannken Exp $
+# $NetBSD: FOURMEG,v 1.38 2011/03/06 17:08:18 bouyer Exp $
# FOURMEG arm26 configuration -- something small
@@ -48,7 +48,8 @@ file-system FDESC # /dev/fd
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options NFSSERVER # Sun NFS-compatible file system server
options FFS_EI # FFS endianness-independence support
options NFS_V2_ONLY # Make a smaller NFS
diff --git a/sys/arch/acorn26/conf/GENERIC b/sys/arch/acorn26/conf/GENERIC
index ade7e4ea538..15dd701ce3d 100644
--- a/sys/arch/acorn26/conf/GENERIC
+++ b/sys/arch/acorn26/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.63 2010/11/23 11:13:52 hannken Exp $
+# $NetBSD: GENERIC,v 1.64 2011/03/06 17:08:18 bouyer Exp $
#
# GENERIC machine description file
#
@@ -65,7 +65,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
options NFSSERVER # Sun NFS-compatible file system server
options FFS_EI # FFS endianness-independence support
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/acorn26/conf/INSTALL b/sys/arch/acorn26/conf/INSTALL
index fe7fd7cc08a..d95bd139140 100644
--- a/sys/arch/acorn26/conf/INSTALL
+++ b/sys/arch/acorn26/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.31 2010/11/23 11:13:52 hannken Exp $
+# $NetBSD: INSTALL,v 1.32 2011/03/06 17:08:18 bouyer Exp $
# INSTALL configuration, used to generate installation media
@@ -46,7 +46,8 @@ file-system KERNFS # /kern
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options NFSSERVER # Sun NFS-compatible file system server
options FFS_EI # FFS endianness-independence support
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/acorn32/conf/EB7500ATX b/sys/arch/acorn32/conf/EB7500ATX
index 947af475b9e..405f52411f9 100644
--- a/sys/arch/acorn32/conf/EB7500ATX
+++ b/sys/arch/acorn32/conf/EB7500ATX
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.41 2010/11/23 11:13:52 hannken Exp $
+# $NetBSD: EB7500ATX,v 1.42 2011/03/06 17:08:18 bouyer Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.41 $"
+#ident "EB7500ATX-$Revision: 1.42 $"
# estimated number of users
maxusers 32
@@ -62,7 +62,8 @@ file-system UNION # union file system
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # UFS 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 NFSSERVER
diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC
index 90b926c6742..8d58ddf6adb 100644
--- a/sys/arch/acorn32/conf/GENERIC
+++ b/sys/arch/acorn32/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.97 2010/11/23 11:13:52 hannken Exp $
+# $NetBSD: GENERIC,v 1.98 2011/03/06 17:08:18 bouyer Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.97 $"
+#ident "GENERIC-$Revision: 1.98 $"
# estimated number of users
maxusers 32
@@ -69,7 +69,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS 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/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL
index a1c8fe31e15..ac6b1e67e4b 100644
--- a/sys/arch/acorn32/conf/INSTALL
+++ b/sys/arch/acorn32/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.58 2010/11/23 11:13:52 hannken Exp $
+# $NetBSD: INSTALL,v 1.59 2011/03/06 17:08:18 bouyer Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.58 $"
+#ident "INSTALL-$Revision: 1.59 $"
# estimated number of users
maxusers 32
@@ -66,7 +66,8 @@ file-system KERNFS # /kern
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS 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 NFSSERVER
diff --git a/sys/arch/acorn32/conf/LOWMEM_WSCONS b/sys/arch/acorn32/conf/LOWMEM_WSCONS
index 28eaba4bea7..8bed959fcb0 100644
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.55 2010/11/23 11:13:52 hannken Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.56 2011/03/06 17:08:18 bouyer Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -53,7 +53,8 @@ file-system KERNFS # /kern
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options NFSSERVER
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/acorn32/conf/NC b/sys/arch/acorn32/conf/NC
index 47b9a1c7f2b..c4e5d05d730 100644
--- a/sys/arch/acorn32/conf/NC
+++ b/sys/arch/acorn32/conf/NC
@@ -1,4 +1,4 @@
-# $NetBSD: NC,v 1.53 2010/11/23 11:13:52 hannken Exp $
+# $NetBSD: NC,v 1.54 2011/03/06 17:08:18 bouyer Exp $
#
# NC - with wscons
#
@@ -48,7 +48,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options NFSSERVER
# Networking options
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 24ceac948ac..02ab5a6699b 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.338 2010/11/23 11:13:53 hannken Exp $
+# $NetBSD: GENERIC,v 1.339 2011/03/06 17:08:18 bouyer Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.338 $"
+ident "GENERIC-$Revision: 1.339 $"
maxusers 32
@@ -91,7 +91,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS 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/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index fe05ce1a197..a4646b217b2 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.316 2011/03/04 04:48:40 jruoho Exp $
+# $NetBSD: GENERIC,v 1.317 2011/03/06 17:08:19 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.316 $"
+#ident "GENERIC-$Revision: 1.317 $"
maxusers 64 # estimated number of users
@@ -160,7 +160,8 @@ file-system TMPFS # Efficient memory file-system
#file-system NILFS # experimental - NTT's NiLFS(2)
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0
index 1520c71695f..b1e8609d5f5 100644
--- a/sys/arch/amd64/conf/XEN3_DOM0
+++ b/sys/arch/amd64/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.64 2011/02/24 10:56:00 jruoho Exp $
+# $NetBSD: XEN3_DOM0,v 1.65 2011/03/06 17:08:19 bouyer Exp $
include "arch/amd64/conf/std.xen"
@@ -105,7 +105,8 @@ file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/amd64/conf/XEN3_DOMU b/sys/arch/amd64/conf/XEN3_DOMU
index 6dccdc1f735..bdadbcc1da6 100644
--- a/sys/arch/amd64/conf/XEN3_DOMU
+++ b/sys/arch/amd64/conf/XEN3_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.26 2010/11/23 11:13:54 hannken Exp $
+# $NetBSD: XEN3_DOMU,v 1.27 2011/03/06 17:08:19 bouyer Exp $
include "arch/amd64/conf/std.xen"
@@ -92,7 +92,8 @@ file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
index 2445de51047..ab043667196 100644
--- a/sys/arch/amiga/conf/DRACO
+++ b/sys/arch/amiga/conf/DRACO
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.136 2011/01/14 10:03:44 phx Exp $
+# $NetBSD: DRACO,v 1.137 2011/03/06 17:08:19 bouyer Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.136 $"
+#ident "GENERIC-$Revision: 1.137 $"
maxusers 8
@@ -115,7 +115,8 @@ file-system TMPFS # Efficient memory file-system
#options FFS_EI # FFS Endian Independant support
options WAPBL # File system journaling support - Experimental
-options QUOTA # User and group quotas in FFS
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options NFSSERVER # Network File System server side code
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index a0058eb9d96..22a8057f78e 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.265 2011/01/14 10:03:44 phx Exp $
+# $NetBSD: GENERIC,v 1.266 2011/03/06 17:08:19 bouyer Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.265 $"
+#ident "GENERIC-$Revision: 1.266 $"
maxusers 8
@@ -127,7 +127,8 @@ file-system TMPFS # Efficient memory file-system
#options FFS_EI # FFS Endian Independant support
options WAPBL # File system journaling support - Experimental
-options QUOTA # User and group quotas in FFS
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options NFSSERVER # Network File System server side code
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/amiga/conf/GENERIC.in b/sys/arch/amiga/conf/GENERIC.in
index d6c23128fc3..626bac60865 100644
--- a/sys/arch/amiga/conf/GENERIC.in
+++ b/sys/arch/amiga/conf/GENERIC.in
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.77 2011/01/14 10:01:12 phx Exp $
+# $NetBSD: GENERIC.in,v 1.78 2011/03/06 17:08:19 bouyer Exp $
#
# GENERIC machine description file
#
@@ -56,7 +56,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.77 $"
+#ident "GENERIC-$Revision: 1.78 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -171,7 +171,8 @@ file-system TMPFS # Efficient memory file-system
options WAPBL # File system journaling support - Experimental
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
-options QUOTA # User and group quotas in FFS
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options NFSSERVER # Network File System server side code
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/amigappc/conf/GENERIC b/sys/arch/amigappc/conf/GENERIC
index 4b48994bbb4..0346253b632 100644
--- a/sys/arch/amigappc/conf/GENERIC
+++ b/sys/arch/amigappc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.6 2011/01/14 12:54:39 phx Exp $
+# $NetBSD: GENERIC,v 1.7 2011/03/06 17:08:20 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amigappc/conf/std.amigappc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
maxusers 8
@@ -123,7 +123,8 @@ file-system TMPFS # Efficient memory file-system
#options FFS_EI # FFS Endian Independant support
options WAPBL # File system journaling support - Experimental
-options QUOTA # User and group quotas in FFS
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options NFSSERVER # Network File System server side code
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/amigappc/conf/NULL b/sys/arch/amigappc/conf/NULL
index d3e108933da..c05842e4831 100644
--- a/sys/arch/amigappc/conf/NULL
+++ b/sys/arch/amigappc/conf/NULL
@@ -1,4 +1,4 @@
-# $NetBSD: NULL,v 1.29 2011/01/14 12:54:39 phx Exp $
+# $NetBSD: NULL,v 1.30 2011/03/06 17:08:20 bouyer Exp $
#
# NULL machine description file
#
@@ -7,7 +7,7 @@ include "arch/amigappc/conf/std.amigappc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.29 $"
+#ident "GENERIC-$Revision: 1.30 $"
maxusers 8
@@ -107,7 +107,8 @@ file-system TMPFS # Efficient memory file-system
#options FFS_EI # FFS Endian Independant support
#options WAPBL # File system journaling support - Experimental
-#options QUOTA # User and group quotas in FFS
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
#options NFSSERVER # Network File System server side code
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/arc/conf/ARCTIC b/sys/arch/arc/conf/ARCTIC
index 9eb70be86ae..b9089c2b067 100644
--- a/sys/arch/arc/conf/ARCTIC
+++ b/sys/arch/arc/conf/ARCTIC
@@ -1,4 +1,4 @@
-# $NetBSD: ARCTIC,v 1.55 2010/11/23 11:13:54 hannken Exp $
+# $NetBSD: ARCTIC,v 1.56 2011/03/06 17:08:20 bouyer Exp $
# $OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $
#
# configuration file for DeskStation
@@ -84,7 +84,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 5dcc8130966..4ba9497a628 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.166 2011/03/06 14:58:43 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.167 2011/03/06 17:08:20 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.166 $"
+#ident "GENERIC-$Revision: 1.167 $"
maxusers 32 # estimated number of users
@@ -119,7 +119,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/arc/conf/M403 b/sys/arch/arc/conf/M403
index 5409b682bfa..218a77b8ed4 100644
--- a/sys/arch/arc/conf/M403
+++ b/sys/arch/arc/conf/M403
@@ -1,4 +1,4 @@
-# $NetBSD: M403,v 1.51 2010/11/23 11:13:54 hannken Exp $
+# $NetBSD: M403,v 1.52 2011/03/06 17:08:20 bouyer Exp $
#
# configuration file for MIPS Magnum 4000 system
#
@@ -77,7 +77,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options NFSSERVER # Network File System server
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/arc/conf/MIMORI b/sys/arch/arc/conf/MIMORI
index c1545a4179e..2a113c29cb0 100644
--- a/sys/arch/arc/conf/MIMORI
+++ b/sys/arch/arc/conf/MIMORI
@@ -1,4 +1,4 @@
-# $NetBSD: MIMORI,v 1.56 2010/11/23 11:13:54 hannken Exp $
+# $NetBSD: MIMORI,v 1.57 2011/03/06 17:08:20 bouyer Exp $
# NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
#
# MIMORI -- My NEC RISCstation 2250 (ur)
@@ -79,7 +79,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
diff --git a/sys/arch/arc/conf/PICA b/sys/arch/arc/conf/PICA
index 40e5f1ed2e7..6593fe12d8c 100644
--- a/sys/arch/arc/conf/PICA
+++ b/sys/arch/arc/conf/PICA
@@ -1,4 +1,4 @@
-# $NetBSD: PICA,v 1.68 2010/11/23 11:13:54 hannken Exp $
+# $NetBSD: PICA,v 1.69 2011/03/06 17:08:20 bouyer Exp $
#
# configuration file for ACER PICA system
#
@@ -78,7 +78,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options NFSSERVER # Network File System server
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK
index 8437e522720..d7cae6d30dc 100644
--- a/sys/arch/arc/conf/RAMDISK
+++ b/sys/arch/arc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.78 2009/12/07 08:50:01 he Exp $
+# $NetBSD: RAMDISK,v 1.79 2011/03/06 17:08:20 bouyer Exp $
#
# memory disk based configuration file for MIPS R4x00 ARC Systems
#
@@ -44,6 +44,7 @@ no file-system TMPFS
no file-system PTYFS
no options QUOTA
+no options QUOTA2
no options NFSSERVER
no options PPP_FILTER
no options NETATALK
diff --git a/sys/arch/arc/conf/RPC44 b/sys/arch/arc/conf/RPC44
index 32abfd08952..5bea485bb3a 100644
--- a/sys/arch/arc/conf/RPC44
+++ b/sys/arch/arc/conf/RPC44
@@ -1,4 +1,4 @@
-# $NetBSD: RPC44,v 1.38 2011/03/06 14:58:43 tsutsui Exp $
+# $NetBSD: RPC44,v 1.39 2011/03/06 17:08:20 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.38 $"
+#ident "GENERIC-$Revision: 1.39 $"
maxusers 32 # estimated number of users
@@ -105,7 +105,8 @@ file-system UNION # union file system
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options NFSSERVER # Network File System server
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/atari/conf/GENERIC.in b/sys/arch/atari/conf/GENERIC.in
index 52d086f985a..284d8726e97 100644
--- a/sys/arch/atari/conf/GENERIC.in
+++ b/sys/arch/atari/conf/GENERIC.in
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.in,v 1.92 2010/12/12 09:56:15 tsutsui Exp $
+# $NetBSD: GENERIC.in,v 1.93 2011/03/06 17:08:20 bouyer Exp $
#
# Generic atari
#
@@ -134,7 +134,8 @@ file-system TMPFS # Efficient memory file-system
# File system options
options WAPBL # File system journaling support - Experimental
#if !defined(SMALL030_KERNEL)
-#options QUOTA # Disk quotas for local disks
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options NFSSERVER # Network File System server side code
diff --git a/sys/arch/bebox/conf/GENERIC b/sys/arch/bebox/conf/GENERIC
index e4ee7c9182b..287af9e21a1 100644
--- a/sys/arch/bebox/conf/GENERIC
+++ b/sys/arch/bebox/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.125 2010/11/23 11:13:55 hannken Exp $
+# $NetBSD: GENERIC,v 1.126 2011/03/06 17:08:20 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.125 $"
+#ident "GENERIC-$Revision: 1.126 $"
maxusers 32
@@ -97,7 +97,8 @@ file-system TMPFS # Efficient memory file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
# File system options
-options QUOTA # UFS 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/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index e8431be8314..e91e116e640 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.133 2010/11/23 11:13:55 hannken Exp $
+# $NetBSD: GENERIC,v 1.134 2011/03/06 17:08:21 bouyer Exp $
#
# GENERIC machine description file
#
@@ -76,7 +76,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/cats/conf/INSTALL b/sys/arch/cats/conf/INSTALL
index f56e7b8ce23..03b848817d8 100644
--- a/sys/arch/cats/conf/INSTALL
+++ b/sys/arch/cats/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.77 2010/11/23 11:13:55 hannken Exp $
+# $NetBSD: INSTALL,v 1.78 2011/03/06 17:08:21 bouyer Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@@ -49,7 +49,8 @@ file-system KERNFS # /kern
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/cesfic/conf/GENERIC b/sys/arch/cesfic/conf/GENERIC
index 2f098c5e29c..6f7a251244e 100644
--- a/sys/arch/cesfic/conf/GENERIC
+++ b/sys/arch/cesfic/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.53 2010/02/08 19:02:27 joerg Exp $
+# $NetBSD: GENERIC,v 1.54 2011/03/06 17:08:21 bouyer Exp $
#
# GENERIC machine description file
#
@@ -78,7 +78,8 @@ file-system PTYFS # /dev/pts/N support
# Filesystem options
options FIFO # POSIX fifo support (in all filesystems)
-#options QUOTA # User and group quotas in FFS
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options NFSSERVER # Network filesystem server
# Networking options
diff --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC
index aec85951119..c83ba3b3360 100644
--- a/sys/arch/cobalt/conf/GENERIC
+++ b/sys/arch/cobalt/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.128 2011/02/20 07:54:10 matt Exp $
+# $NetBSD: GENERIC,v 1.129 2011/03/06 17:08:21 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.128 $"
+#ident "GENERIC-$Revision: 1.129 $"
maxusers 32
@@ -93,7 +93,8 @@ file-system TMPFS # Efficient memory file-system
# File system options
options NFSSERVER # Sun NFS-compatible filesystem server
-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/cobalt/conf/INSTALL b/sys/arch/cobalt/conf/INSTALL
index dc749ea0e12..e4437bef4e7 100644
--- a/sys/arch/cobalt/conf/INSTALL
+++ b/sys/arch/cobalt/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.42 2010/11/23 11:13:55 hannken Exp $
+# $NetBSD: INSTALL,v 1.43 2011/03/06 17:08:21 bouyer Exp $
#
# INSTALL -- installation and rescue kernel.
#
@@ -10,7 +10,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.42 $"
+#ident "INSTALL-$Revision: 1.43 $"
makeoptions COPTS="-Os -mmemcpy"
makeoptions CPUFLAGS="-march=vr5000 -mabi=32"
@@ -83,7 +83,8 @@ file-system MFS # memory-based filesystem
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/dreamcast/conf/GENERIC b/sys/arch/dreamcast/conf/GENERIC
index 531b47de3db..233a9a9d2ec 100644
--- a/sys/arch/dreamcast/conf/GENERIC
+++ b/sys/arch/dreamcast/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.100 2011/01/03 06:07:42 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.101 2011/03/06 17:08:22 bouyer Exp $
#
# GENERIC machine description file
#
@@ -90,7 +90,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent supoprt
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/emips/conf/GENERIC b/sys/arch/emips/conf/GENERIC
index 6c7058b8d15..103ecafbc0f 100644
--- a/sys/arch/emips/conf/GENERIC
+++ b/sys/arch/emips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1 2011/01/26 01:18:49 pooka Exp $
+# $NetBSD: GENERIC,v 1.2 2011/03/06 17:08:22 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/emips/conf/std.emips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1 $"
+#ident "GENERIC-$Revision: 1.2 $"
maxusers 64
@@ -90,7 +90,8 @@ file-system TMPFS # Efficient memory file-system
file-system UDF # experimental - OSTA UDF CD/DVD file-system
options NFSSERVER # Sun NFS-compatible filesystem (server)
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
options FFS_EI # FFS Endian Independant support
#options FFS_NO_SNAPSHOT # No FFS snapshot support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/evbarm/conf/ADI_BRH b/sys/arch/evbarm/conf/ADI_BRH
index 1858cf3b88a..9ae30026291 100644
--- a/sys/arch/evbarm/conf/ADI_BRH
+++ b/sys/arch/evbarm/conf/ADI_BRH
@@ -1,4 +1,4 @@
-# $NetBSD: ADI_BRH,v 1.52 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: ADI_BRH,v 1.53 2011/03/06 17:08:22 bouyer Exp $
#
# ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board
#
@@ -45,7 +45,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/ARMADILLO210 b/sys/arch/evbarm/conf/ARMADILLO210
index 446f89a428d..4b5e9f2c439 100644
--- a/sys/arch/evbarm/conf/ARMADILLO210
+++ b/sys/arch/evbarm/conf/ARMADILLO210
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO210,v 1.16 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: ARMADILLO210,v 1.17 2011/03/06 17:08:22 bouyer Exp $
#
# ARMADILLO210 -- Atmark Techno, Armadillo-210
#
@@ -38,7 +38,8 @@ file-system NFS # Network file system
#file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS 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/evbarm/conf/ARMADILLO9 b/sys/arch/evbarm/conf/ARMADILLO9
index bb7c91d0c06..45009a62d21 100644
--- a/sys/arch/evbarm/conf/ARMADILLO9
+++ b/sys/arch/evbarm/conf/ARMADILLO9
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.28 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: ARMADILLO9,v 1.29 2011/03/06 17:08:22 bouyer Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -38,7 +38,8 @@ file-system UNION # union file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS 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/evbarm/conf/BEAGLEBOARD b/sys/arch/evbarm/conf/BEAGLEBOARD
index a4ff4fb8c8e..55175e0eaf6 100644
--- a/sys/arch/evbarm/conf/BEAGLEBOARD
+++ b/sys/arch/evbarm/conf/BEAGLEBOARD
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBOARD,v 1.17 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: BEAGLEBOARD,v 1.18 2011/03/06 17:08:22 bouyer Exp $
#
# BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
#
@@ -43,7 +43,8 @@ file-system TMPFS # memory file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/CP3100 b/sys/arch/evbarm/conf/CP3100
index 0f11675bfac..4b4a0dc7f97 100644
--- a/sys/arch/evbarm/conf/CP3100
+++ b/sys/arch/evbarm/conf/CP3100
@@ -1,4 +1,4 @@
-# $NetBSD: CP3100,v 1.20 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: CP3100,v 1.21 2011/03/06 17:08:22 bouyer Exp $
#
# CP3100 -- Certance CP3100 Kernel
#
@@ -45,7 +45,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/GEMINI b/sys/arch/evbarm/conf/GEMINI
index 3400b2c1d8c..a0c288ec2fc 100644
--- a/sys/arch/evbarm/conf/GEMINI
+++ b/sys/arch/evbarm/conf/GEMINI
@@ -40,7 +40,8 @@ file-system MSDOSFS # MS-DOS file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
#options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/GEMINI_MASTER b/sys/arch/evbarm/conf/GEMINI_MASTER
index f78cdccff44..11df4f27347 100644
--- a/sys/arch/evbarm/conf/GEMINI_MASTER
+++ b/sys/arch/evbarm/conf/GEMINI_MASTER
@@ -41,7 +41,8 @@ file-system MSDOSFS # MS-DOS file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
#options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/GEMINI_SLAVE b/sys/arch/evbarm/conf/GEMINI_SLAVE
index abac2301c33..52ff48eda39 100644
--- a/sys/arch/evbarm/conf/GEMINI_SLAVE
+++ b/sys/arch/evbarm/conf/GEMINI_SLAVE
@@ -40,7 +40,8 @@ file-system MSDOSFS # MS-DOS file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
#options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/GUMSTIX b/sys/arch/evbarm/conf/GUMSTIX
index a789865af5c..07114aab36e 100644
--- a/sys/arch/evbarm/conf/GUMSTIX
+++ b/sys/arch/evbarm/conf/GUMSTIX
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.55 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: GUMSTIX,v 1.56 2011/03/06 17:08:22 bouyer Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -60,7 +60,8 @@ file-system TMPFS # Efficient memory file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
diff --git a/sys/arch/evbarm/conf/HDL_G b/sys/arch/evbarm/conf/HDL_G
index 6bb88efc400..2d890bf47d9 100644
--- a/sys/arch/evbarm/conf/HDL_G
+++ b/sys/arch/evbarm/conf/HDL_G
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.21 2011/03/06 02:18:36 jakllsch Exp $
+# $NetBSD: HDL_G,v 1.22 2011/03/06 17:08:22 bouyer Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@@ -48,7 +48,8 @@ file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/IGEPV2 b/sys/arch/evbarm/conf/IGEPV2
index c015407d384..8280a508039 100644
--- a/sys/arch/evbarm/conf/IGEPV2
+++ b/sys/arch/evbarm/conf/IGEPV2
@@ -1,5 +1,5 @@
#
-# $NetBSD: IGEPV2,v 1.4 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: IGEPV2,v 1.5 2011/03/06 17:08:22 bouyer Exp $
#
# IGEPv2 -- TI OMAP 3530 Eval Board Kernel
#
@@ -44,7 +44,8 @@ file-system TMPFS # memory file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
#options SOFTDEP
diff --git a/sys/arch/evbarm/conf/IMX31LITE b/sys/arch/evbarm/conf/IMX31LITE
index 1160cbc5fcd..a727dc6ba9c 100644
--- a/sys/arch/evbarm/conf/IMX31LITE
+++ b/sys/arch/evbarm/conf/IMX31LITE
@@ -1,4 +1,4 @@
-# $NetBSD: IMX31LITE,v 1.12 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: IMX31LITE,v 1.13 2011/03/06 17:08:22 bouyer Exp $
#
# IMX31LITE -- Freescale IMX31LITE Evaluation Board Kernel
#
@@ -44,7 +44,8 @@ file-system TMPFS # memory file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/INTEGRATOR b/sys/arch/evbarm/conf/INTEGRATOR
index 334ae670c17..111eccecc3b 100644
--- a/sys/arch/evbarm/conf/INTEGRATOR
+++ b/sys/arch/evbarm/conf/INTEGRATOR
@@ -1,4 +1,4 @@
-# $NetBSD: INTEGRATOR,v 1.60 2011/03/06 02:18:36 jakllsch Exp $
+# $NetBSD: INTEGRATOR,v 1.61 2011/03/06 17:08:22 bouyer Exp $
#
# GENERIC -- ARM Integrator board Generic kernel
#
@@ -45,7 +45,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/IQ31244 b/sys/arch/evbarm/conf/IQ31244
index c6a77850d6a..781d20dd30e 100644
--- a/sys/arch/evbarm/conf/IQ31244
+++ b/sys/arch/evbarm/conf/IQ31244
@@ -1,4 +1,4 @@
-# $NetBSD: IQ31244,v 1.51 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: IQ31244,v 1.52 2011/03/06 17:08:22 bouyer Exp $
#
# IQ31244 -- Intel IQ31244 Evaluation Board Kernel
#
@@ -45,7 +45,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/IQ80310 b/sys/arch/evbarm/conf/IQ80310
index ef9d2be1cb3..bf6307ed8ab 100644
--- a/sys/arch/evbarm/conf/IQ80310
+++ b/sys/arch/evbarm/conf/IQ80310
@@ -1,4 +1,4 @@
-# $NetBSD: IQ80310,v 1.70 2011/03/06 02:18:36 jakllsch Exp $
+# $NetBSD: IQ80310,v 1.71 2011/03/06 17:08:22 bouyer Exp $
#
# IQ80310 -- Intel IQ80310 Evaluation Board Kernel
#
@@ -45,7 +45,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/IQ80321 b/sys/arch/evbarm/conf/IQ80321
index 7e0f430f336..e4954ed5706 100644
--- a/sys/arch/evbarm/conf/IQ80321
+++ b/sys/arch/evbarm/conf/IQ80321
@@ -1,4 +1,4 @@
-# $NetBSD: IQ80321,v 1.66 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: IQ80321,v 1.67 2011/03/06 17:08:22 bouyer Exp $
#
# IQ80321 -- Intel IQ80321 Evaluation Board Kernel
#
@@ -45,7 +45,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/IXDP425 b/sys/arch/evbarm/conf/IXDP425
index c2282296dd8..792f23218d0 100644
--- a/sys/arch/evbarm/conf/IXDP425
+++ b/sys/arch/evbarm/conf/IXDP425
@@ -1,4 +1,4 @@
-# $NetBSD: IXDP425,v 1.31 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: IXDP425,v 1.32 2011/03/06 17:08:22 bouyer Exp $
#
# IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
#
@@ -49,7 +49,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/IXM1200 b/sys/arch/evbarm/conf/IXM1200
index 95790a863f3..55225e5f37c 100644
--- a/sys/arch/evbarm/conf/IXM1200
+++ b/sys/arch/evbarm/conf/IXM1200
@@ -1,4 +1,4 @@
-# $NetBSD: IXM1200,v 1.43 2011/03/06 02:22:27 jakllsch Exp $
+# $NetBSD: IXM1200,v 1.44 2011/03/06 17:08:22 bouyer Exp $
#
# IXM1200 -- Intel IXM1200 Evaluation Board Kernel
#
@@ -44,7 +44,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/LUBBOCK b/sys/arch/evbarm/conf/LUBBOCK
index 92bca845f4e..4aa2fe09df1 100644
--- a/sys/arch/evbarm/conf/LUBBOCK
+++ b/sys/arch/evbarm/conf/LUBBOCK
@@ -43,7 +43,8 @@ file-system MSDOSFS # MS-DOS file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/MARVELL_NAS b/sys/arch/evbarm/conf/MARVELL_NAS
index c3402c01a9d..69e88edee1e 100644
--- a/sys/arch/evbarm/conf/MARVELL_NAS
+++ b/sys/arch/evbarm/conf/MARVELL_NAS
@@ -1,4 +1,4 @@
-# $NetBSD: MARVELL_NAS,v 1.2 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: MARVELL_NAS,v 1.3 2011/03/06 17:08:22 bouyer Exp $
#
# This configuration supports for generically Marvell NAS.
@@ -52,7 +52,8 @@ file-system UDF # experimental - OSTA UDF CD/DVD file-system
file-system HFS # experimental - Apple HFS+ (read-only)
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
diff --git a/sys/arch/evbarm/conf/MPCSA_GENERIC b/sys/arch/evbarm/conf/MPCSA_GENERIC
index 8c4fc122db8..bf058fd9102 100644
--- a/sys/arch/evbarm/conf/MPCSA_GENERIC
+++ b/sys/arch/evbarm/conf/MPCSA_GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.18 2011/02/06 23:25:16 jmcneill Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.19 2011/03/06 17:08:22 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.18 $"
+#ident "GENERIC-$Revision: 1.19 $"
maxusers 32 # estimated number of users
@@ -149,7 +149,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
diff --git a/sys/arch/evbarm/conf/NAPPI b/sys/arch/evbarm/conf/NAPPI
index 6be2139a126..1cda41decee 100644
--- a/sys/arch/evbarm/conf/NAPPI
+++ b/sys/arch/evbarm/conf/NAPPI
@@ -1,4 +1,4 @@
-# $NetBSD: NAPPI,v 1.39 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: NAPPI,v 1.40 2011/03/06 17:08:22 bouyer Exp $
#
# NAPPI -- Netwise APlication Platform Board Kernel
#
@@ -44,7 +44,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/NETWALKER b/sys/arch/evbarm/conf/NETWALKER
index 57a80270ba2..45ad1147b56 100644
--- a/sys/arch/evbarm/conf/NETWALKER
+++ b/sys/arch/evbarm/conf/NETWALKER
@@ -1,4 +1,4 @@
-# $NetBSD: NETWALKER,v 1.3 2010/11/30 13:07:29 bsh Exp $
+# $NetBSD: NETWALKER,v 1.4 2011/03/06 17:08:22 bouyer Exp $
#
# NETWALKER -- Sharp
#
@@ -46,7 +46,8 @@ file-system TMPFS # memory file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/NSLU2 b/sys/arch/evbarm/conf/NSLU2
index 8f95166ebb4..6fc79858ecd 100644
--- a/sys/arch/evbarm/conf/NSLU2
+++ b/sys/arch/evbarm/conf/NSLU2
@@ -1,4 +1,4 @@
-# $NetBSD: NSLU2,v 1.17 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: NSLU2,v 1.18 2011/03/06 17:08:22 bouyer Exp $
#
# Linksys NSLU2 "Slug" NAS Device
#
@@ -50,7 +50,8 @@ file-system NFS # Network file system
#file-system UNION # union file system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
diff --git a/sys/arch/evbarm/conf/OSK5912 b/sys/arch/evbarm/conf/OSK5912
index 80626e246b8..0b5fac5c246 100644
--- a/sys/arch/evbarm/conf/OSK5912
+++ b/sys/arch/evbarm/conf/OSK5912
@@ -38,7 +38,8 @@ file-system MSDOSFS # MS-DOS file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/OVERO b/sys/arch/evbarm/conf/OVERO
index 5bf3bf9b7d7..a685f435cf1 100644
--- a/sys/arch/evbarm/conf/OVERO
+++ b/sys/arch/evbarm/conf/OVERO
@@ -1,5 +1,5 @@
#
-# $NetBSD: OVERO,v 1.7 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: OVERO,v 1.8 2011/03/06 17:08:22 bouyer Exp $
#
# OVERO -- Gumstix. Inc. Overo platforms kernel
#
@@ -58,7 +58,8 @@ file-system PTYFS # /dev/pts/N support
#file-system HFS # experimental - Apple HFS+ (read-only)
# File system options
-#options QUOTA # UFS 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/evbarm/conf/SHEEVAPLUG b/sys/arch/evbarm/conf/SHEEVAPLUG
index 64e2db02486..0def142422c 100644
--- a/sys/arch/evbarm/conf/SHEEVAPLUG
+++ b/sys/arch/evbarm/conf/SHEEVAPLUG
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.4 2011/03/06 02:22:27 jakllsch Exp $
+# $NetBSD: SHEEVAPLUG,v 1.5 2011/03/06 17:08:22 bouyer Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -56,7 +56,8 @@ file-system TMPFS # Efficient memory file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
diff --git a/sys/arch/evbarm/conf/SMDK2410 b/sys/arch/evbarm/conf/SMDK2410
index 504f18b3e74..1572836d7a7 100644
--- a/sys/arch/evbarm/conf/SMDK2410
+++ b/sys/arch/evbarm/conf/SMDK2410
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2410,v 1.42 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: SMDK2410,v 1.43 2011/03/06 17:08:22 bouyer Exp $
#
# SMDK2410 -- Samsung's S3C2410 evaluation board.
#
@@ -56,7 +56,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/SMDK2800 b/sys/arch/evbarm/conf/SMDK2800
index e3fd5997b48..e52f3ccfb6f 100644
--- a/sys/arch/evbarm/conf/SMDK2800
+++ b/sys/arch/evbarm/conf/SMDK2800
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2800,v 1.42 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: SMDK2800,v 1.43 2011/03/06 17:08:23 bouyer Exp $
#
# SMDK2800 -- Samsung's S3C2800 evaluation board.
#
@@ -52,7 +52,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/TEAMASA_NPWR b/sys/arch/evbarm/conf/TEAMASA_NPWR
index c1ad40dca55..e55fa82373a 100644
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR,v 1.67 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: TEAMASA_NPWR,v 1.68 2011/03/06 17:08:23 bouyer Exp $
#
# TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
# server appliance.
@@ -48,7 +48,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/TEAMASA_NPWR_FC b/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
index 775a3fe06e9..ca1811d97c4 100644
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR_FC,v 1.31 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: TEAMASA_NPWR_FC,v 1.32 2011/03/06 17:08:23 bouyer Exp $
#
# TeamASA NPWR-FC, i80321-based SBC
#
@@ -46,7 +46,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/TISDP2420 b/sys/arch/evbarm/conf/TISDP2420
index 649171eafc2..bd70aa61310 100644
--- a/sys/arch/evbarm/conf/TISDP2420
+++ b/sys/arch/evbarm/conf/TISDP2420
@@ -1,5 +1,5 @@
#
-# $NetBSD: TISDP2420,v 1.15 2011/03/06 02:22:27 jakllsch Exp $
+# $NetBSD: TISDP2420,v 1.16 2011/03/06 17:08:23 bouyer Exp $
#
# TISDP2420 -- TI OMAP 2420 Eval Board Kernel
#
@@ -43,7 +43,8 @@ file-system TMPFS # memory file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/TISDP2430 b/sys/arch/evbarm/conf/TISDP2430
index 46fd299f32a..0df820ddf67 100644
--- a/sys/arch/evbarm/conf/TISDP2430
+++ b/sys/arch/evbarm/conf/TISDP2430
@@ -1,5 +1,5 @@
#
-# $NetBSD: TISDP2430,v 1.15 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: TISDP2430,v 1.16 2011/03/06 17:08:23 bouyer Exp $
#
# TISDP2430 -- TI OMAP 2430 Eval Board Kernel
#
@@ -42,7 +42,8 @@ file-system TMPFS # memory file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/TS7200 b/sys/arch/evbarm/conf/TS7200
index 1ff59ab04c7..4f5a7fa6364 100644
--- a/sys/arch/evbarm/conf/TS7200
+++ b/sys/arch/evbarm/conf/TS7200
@@ -1,4 +1,4 @@
-# $NetBSD: TS7200,v 1.43 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: TS7200,v 1.44 2011/03/06 17:08:23 bouyer Exp $
#
# TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
#
@@ -51,7 +51,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/TWINTAIL b/sys/arch/evbarm/conf/TWINTAIL
index cb8f13c4e0c..91f800cab4f 100644
--- a/sys/arch/evbarm/conf/TWINTAIL
+++ b/sys/arch/evbarm/conf/TWINTAIL
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.40 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: TWINTAIL,v 1.41 2011/03/06 17:08:23 bouyer Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -50,7 +50,8 @@ file-system UNION # union file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbarm/conf/VIPER b/sys/arch/evbarm/conf/VIPER
index 0264d3d45d4..30901fe038a 100644
--- a/sys/arch/evbarm/conf/VIPER
+++ b/sys/arch/evbarm/conf/VIPER
@@ -1,4 +1,4 @@
-# $NetBSD: VIPER,v 1.20 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: VIPER,v 1.21 2011/03/06 17:08:23 bouyer Exp $
#
# Arcom Viper
#
@@ -43,7 +43,8 @@ file-system UNION # union file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
diff --git a/sys/arch/evbarm/conf/ZAO425 b/sys/arch/evbarm/conf/ZAO425
index 16b894a8cb4..d102336c1ca 100644
--- a/sys/arch/evbarm/conf/ZAO425
+++ b/sys/arch/evbarm/conf/ZAO425
@@ -1,4 +1,4 @@
-# $NetBSD: ZAO425,v 1.39 2011/03/06 05:08:03 jakllsch Exp $
+# $NetBSD: ZAO425,v 1.40 2011/03/06 17:08:23 bouyer Exp $
#
# ZAO425 -- Intel IXP425
#
@@ -49,7 +49,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/evbmips/conf/ADM5120 b/sys/arch/evbmips/conf/ADM5120
index f9fbcfa1514..9aa624fb147 100644
--- a/sys/arch/evbmips/conf/ADM5120
+++ b/sys/arch/evbmips/conf/ADM5120
@@ -1,11 +1,11 @@
-# $NetBSD: ADM5120,v 1.6 2011/02/20 07:48:33 matt Exp $
+# $NetBSD: ADM5120,v 1.7 2011/03/06 17:08:23 bouyer Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.adm5120"
-#ident "GENERIC-$Revision: 1.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
maxusers 32
@@ -74,7 +74,8 @@ file-system NFS # Sun NFS-compatible filesystem client
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
diff --git a/sys/arch/evbmips/conf/ADM5120-NB b/sys/arch/evbmips/conf/ADM5120-NB
index f7cf1883c42..3ad65e89111 100644
--- a/sys/arch/evbmips/conf/ADM5120-NB
+++ b/sys/arch/evbmips/conf/ADM5120-NB
@@ -1,11 +1,11 @@
-# $NetBSD: ADM5120-NB,v 1.6 2011/02/20 07:48:33 matt Exp $
+# $NetBSD: ADM5120-NB,v 1.7 2011/03/06 17:08:23 bouyer Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.adm5120"
-#ident "GENERIC-$Revision: 1.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
maxusers 32
@@ -74,7 +74,8 @@ file-system NFS # Sun NFS-compatible filesystem client
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
diff --git a/sys/arch/evbmips/conf/ADM5120-USB b/sys/arch/evbmips/conf/ADM5120-USB
index 47e4f1dac6e..5d6851e5ef0 100644
--- a/sys/arch/evbmips/conf/ADM5120-USB
+++ b/sys/arch/evbmips/conf/ADM5120-USB
@@ -1,11 +1,11 @@
-# $NetBSD: ADM5120-USB,v 1.6 2011/02/20 07:48:33 matt Exp $
+# $NetBSD: ADM5120-USB,v 1.7 2011/03/06 17:08:23 bouyer Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.adm5120"
-#ident "GENERIC-$Revision: 1.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
maxusers 32
@@ -70,7 +70,8 @@ file-system NFS # Sun NFS-compatible filesystem client
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
diff --git a/sys/arch/evbmips/conf/ALCHEMY b/sys/arch/evbmips/conf/ALCHEMY
index 8513de09d30..0305a287ae2 100644
--- a/sys/arch/evbmips/conf/ALCHEMY
+++ b/sys/arch/evbmips/conf/ALCHEMY
@@ -1,11 +1,11 @@
-# $NetBSD: ALCHEMY,v 1.31 2011/02/20 07:48:33 matt Exp $
+# $NetBSD: ALCHEMY,v 1.32 2011/03/06 17:08:23 bouyer Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.alchemy"
-#ident "ALCHEMY-$Revision: 1.31 $"
+#ident "ALCHEMY-$Revision: 1.32 $"
maxusers 32
@@ -86,7 +86,8 @@ file-system FDESC # user file descriptor filesystem
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/evbmips/conf/AP30 b/sys/arch/evbmips/conf/AP30
index e7a217d76be..29485c070bd 100644
--- a/sys/arch/evbmips/conf/AP30
+++ b/sys/arch/evbmips/conf/AP30
@@ -1,10 +1,10 @@
-# $NetBSD: AP30,v 1.17 2011/02/20 07:48:33 matt Exp $
+# $NetBSD: AP30,v 1.18 2011/03/06 17:08:23 bouyer Exp $
include "arch/evbmips/conf/std.atheros"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "AP30-$Revision: 1.17 $"
+#ident "AP30-$Revision: 1.18 $"
maxusers 32
@@ -84,7 +84,8 @@ file-system NFS # Sun NFS-compatible filesystem client
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/evbmips/conf/GDIUM b/sys/arch/evbmips/conf/GDIUM
index 907f93661ae..01b97462974 100644
--- a/sys/arch/evbmips/conf/GDIUM
+++ b/sys/arch/evbmips/conf/GDIUM
@@ -1,4 +1,4 @@
-# $NetBSD: GDIUM,v 1.11 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: GDIUM,v 1.12 2011/03/06 17:08:23 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbmips/conf/std.gdium"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GDIUM-$Revision: 1.11 $"
+#ident "GDIUM-$Revision: 1.12 $"
maxusers 16
@@ -85,7 +85,8 @@ file-system PTYFS # /dev/pts/N support
options NFSSERVER # Sun NFS-compatible filesystem (server)
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_NO_SNAPSHOT # No FFS snapshot support
# Networking options
diff --git a/sys/arch/evbmips/conf/MALTA b/sys/arch/evbmips/conf/MALTA
index ead1b863586..101990c384c 100644
--- a/sys/arch/evbmips/conf/MALTA
+++ b/sys/arch/evbmips/conf/MALTA
@@ -1,10 +1,10 @@
-# $NetBSD: MALTA,v 1.58 2011/02/20 07:48:33 matt Exp $
+# $NetBSD: MALTA,v 1.59 2011/03/06 17:08:23 bouyer Exp $
include "arch/evbmips/conf/std.malta"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MALTA-$Revision: 1.58 $"
+#ident "MALTA-$Revision: 1.59 $"
maxusers 32
@@ -78,7 +78,8 @@ file-system TMPFS # Efficient memory file system
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/evbmips/conf/MERAKI b/sys/arch/evbmips/conf/MERAKI
index 07a746cb41a..e3843095755 100644
--- a/sys/arch/evbmips/conf/MERAKI
+++ b/sys/arch/evbmips/conf/MERAKI
@@ -1,10 +1,10 @@
-# $NetBSD: MERAKI,v 1.13 2011/02/20 07:48:33 matt Exp $
+# $NetBSD: MERAKI,v 1.14 2011/03/06 17:08:23 bouyer Exp $
include "arch/evbmips/conf/std.meraki"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MERAKI-$Revision: 1.13 $"
+#ident "MERAKI-$Revision: 1.14 $"
maxusers 32
@@ -83,7 +83,8 @@ file-system NFS # Sun NFS-compatible filesystem client
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/evbmips/conf/RB153 b/sys/arch/evbmips/conf/RB153
index fb5a13b86c5..d365f9eabde 100644
--- a/sys/arch/evbmips/conf/RB153
+++ b/sys/arch/evbmips/conf/RB153
@@ -1,10 +1,10 @@
-# $NetBSD: RB153,v 1.5 2011/02/20 07:48:33 matt Exp $
+# $NetBSD: RB153,v 1.6 2011/03/06 17:08:23 bouyer Exp $
#
# Example kernel config for the RouterBOARD 153.
include "arch/evbmips/conf/std.adm5120"
-#ident "RB153-$Revision: 1.5 $"
+#ident "RB153-$Revision: 1.6 $"
maxusers 32
@@ -59,7 +59,8 @@ file-system NULLFS # NULL layered filesystem
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
diff --git a/sys/arch/evbmips/conf/WGT624V3 b/sys/arch/evbmips/conf/WGT624V3
index ffa2c30edb3..1c9d9a3f6e0 100644
--- a/sys/arch/evbmips/conf/WGT624V3
+++ b/sys/arch/evbmips/conf/WGT624V3
@@ -1,10 +1,10 @@
-# $NetBSD: WGT624V3,v 1.10 2011/02/20 07:48:33 matt Exp $
+# $NetBSD: WGT624V3,v 1.11 2011/03/06 17:08:23 bouyer Exp $
include "arch/evbmips/conf/std.atheros"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "WGT624V3-$Revision: 1.10 $"
+#ident "WGT624V3-$Revision: 1.11 $"
maxusers 32
@@ -85,7 +85,8 @@ file-system NFS # Sun NFS-compatible filesystem client
# File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/evbppc/conf/EV64260 b/sys/arch/evbppc/conf/EV64260
index 5c0c1e75fd1..c1e6ecd4900 100644
--- a/sys/arch/evbppc/conf/EV64260
+++ b/sys/arch/evbppc/conf/EV64260
@@ -1,4 +1,4 @@
-# $NetBSD: EV64260,v 1.45 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: EV64260,v 1.46 2011/03/06 17:08:23 bouyer Exp $
#
# MVP -- Motorola's Multiprocessing Verification Platform
#
@@ -98,7 +98,8 @@ file-system MSDOSFS # MS-DOS file system
#file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/EXPLORA451 b/sys/arch/evbppc/conf/EXPLORA451
index d5182481a77..ae4119e22cb 100644
--- a/sys/arch/evbppc/conf/EXPLORA451
+++ b/sys/arch/evbppc/conf/EXPLORA451
@@ -1,4 +1,4 @@
-# $NetBSD: EXPLORA451,v 1.41 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: EXPLORA451,v 1.42 2011/03/06 17:08:23 bouyer Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -94,7 +94,8 @@ file-system SMBFS # experimental - CIFS; also needs nsmb (below)
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
options NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/MPC8536DS b/sys/arch/evbppc/conf/MPC8536DS
index a6899a14556..4afa7be179d 100644
--- a/sys/arch/evbppc/conf/MPC8536DS
+++ b/sys/arch/evbppc/conf/MPC8536DS
@@ -1,4 +1,4 @@
-# $NetBSD: MPC8536DS,v 1.2 2011/01/18 01:10:24 matt Exp $
+# $NetBSD: MPC8536DS,v 1.3 2011/03/06 17:08:23 bouyer Exp $
#
# MPC8536DS -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "MPC8536DS-$Revision: 1.2 $"
+ident "MPC8536DS-$Revision: 1.3 $"
maxusers 32
@@ -89,7 +89,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/MPC8548CDS b/sys/arch/evbppc/conf/MPC8548CDS
index ec1be3ea5d1..3c40bf91b60 100644
--- a/sys/arch/evbppc/conf/MPC8548CDS
+++ b/sys/arch/evbppc/conf/MPC8548CDS
@@ -1,4 +1,4 @@
-# $NetBSD: MPC8548CDS,v 1.2 2011/01/18 01:10:24 matt Exp $
+# $NetBSD: MPC8548CDS,v 1.3 2011/03/06 17:08:23 bouyer Exp $
#
# MPC8548CDS -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "MPC8548CDS-$Revision: 1.2 $"
+ident "MPC8548CDS-$Revision: 1.3 $"
maxusers 32
@@ -86,7 +86,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/OPENBLOCKS200 b/sys/arch/evbppc/conf/OPENBLOCKS200
index 8d17e3293a7..2eaa2dccc0c 100644
--- a/sys/arch/evbppc/conf/OPENBLOCKS200
+++ b/sys/arch/evbppc/conf/OPENBLOCKS200
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS200,v 1.28 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: OPENBLOCKS200,v 1.29 2011/03/06 17:08:23 bouyer Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -80,7 +80,8 @@ file-system UNION # union file system
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/OPENBLOCKS266 b/sys/arch/evbppc/conf/OPENBLOCKS266
index 1ab656cb908..c0148c407aa 100644
--- a/sys/arch/evbppc/conf/OPENBLOCKS266
+++ b/sys/arch/evbppc/conf/OPENBLOCKS266
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS266,v 1.51 2011/01/04 09:13:19 matt Exp $
+# $NetBSD: OPENBLOCKS266,v 1.52 2011/03/06 17:08:23 bouyer Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.obs266"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "OPENBLOCKS266-$Revision: 1.51 $"
+#ident "OPENBLOCKS266-$Revision: 1.52 $"
maxusers 32
@@ -98,7 +98,8 @@ file-system TMPFS # Efficient memory file-system
# File system options
#
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/OPENBLOCKS600 b/sys/arch/evbppc/conf/OPENBLOCKS600
index 56cf900ddb0..1cd5b861a21 100644
--- a/sys/arch/evbppc/conf/OPENBLOCKS600
+++ b/sys/arch/evbppc/conf/OPENBLOCKS600
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS600,v 1.3 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: OPENBLOCKS600,v 1.4 2011/03/06 17:08:23 bouyer Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.obs600"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "OPENBLOCKS600-$Revision: 1.3 $"
+#ident "OPENBLOCKS600-$Revision: 1.4 $"
maxusers 32
@@ -98,7 +98,8 @@ file-system TMPFS # Efficient memory file-system
# File system options
#
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/PMPPC b/sys/arch/evbppc/conf/PMPPC
index c127913ee76..d4ea77986a3 100644
--- a/sys/arch/evbppc/conf/PMPPC
+++ b/sys/arch/evbppc/conf/PMPPC
@@ -1,4 +1,4 @@
-# $NetBSD: PMPPC,v 1.19 2011/03/02 08:25:08 ahoka Exp $
+# $NetBSD: PMPPC,v 1.20 2011/03/06 17:08:23 bouyer Exp $
#
# PMPPC
#
@@ -77,7 +77,8 @@ file-system UNION # union file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/RB800 b/sys/arch/evbppc/conf/RB800
index c16f97d0871..a13a2ab7efa 100644
--- a/sys/arch/evbppc/conf/RB800
+++ b/sys/arch/evbppc/conf/RB800
@@ -1,4 +1,4 @@
-# $NetBSD: RB800,v 1.2 2011/01/18 01:10:25 matt Exp $
+# $NetBSD: RB800,v 1.3 2011/03/06 17:08:23 bouyer Exp $
#
# RB800 -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "RB800-$Revision: 1.2 $"
+ident "RB800-$Revision: 1.3 $"
maxusers 32
@@ -88,7 +88,8 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/VIRTEX_DFC b/sys/arch/evbppc/conf/VIRTEX_DFC
index d6d4405e973..bf8e2aa8d3d 100644
--- a/sys/arch/evbppc/conf/VIRTEX_DFC
+++ b/sys/arch/evbppc/conf/VIRTEX_DFC
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTEX_DFC,v 1.12 2011/02/06 23:25:17 jmcneill Exp $
+# $NetBSD: VIRTEX_DFC,v 1.13 2011/03/06 17:08:23 bouyer Exp $
#
# VIRTEX_DFC
#
@@ -93,7 +93,8 @@ file-system PTYFS # /dev/pts/N support
file-system TMPFS # virtual memory file system
# File system options
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/VIRTEX_GSRD1 b/sys/arch/evbppc/conf/VIRTEX_GSRD1
index feabb4c4a9a..6092a912b52 100644
--- a/sys/arch/evbppc/conf/VIRTEX_GSRD1
+++ b/sys/arch/evbppc/conf/VIRTEX_GSRD1
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTEX_GSRD1,v 1.10 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: VIRTEX_GSRD1,v 1.11 2011/03/06 17:08:23 bouyer Exp $
#
# VIRTEX_GSRD1
#
@@ -87,7 +87,8 @@ file-system PTYFS # /dev/pts/N support
file-system TMPFS # virtual memory file system
# File system options
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/VIRTEX_GSRD2 b/sys/arch/evbppc/conf/VIRTEX_GSRD2
index dfa5ae6716d..e191f559a76 100644
--- a/sys/arch/evbppc/conf/VIRTEX_GSRD2
+++ b/sys/arch/evbppc/conf/VIRTEX_GSRD2
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTEX_GSRD2,v 1.11 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: VIRTEX_GSRD2,v 1.12 2011/03/06 17:08:23 bouyer Exp $
#
# VIRTEX_GSRD2
#
@@ -95,7 +95,8 @@ file-system PTYFS # /dev/pts/N support
file-system TMPFS # virtual memory file system
# File system options
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/evbppc/conf/WALNUT b/sys/arch/evbppc/conf/WALNUT
index 8abf7289225..80f66157753 100644
--- a/sys/arch/evbppc/conf/WALNUT
+++ b/sys/arch/evbppc/conf/WALNUT
@@ -1,4 +1,4 @@
-# $NetBSD: WALNUT,v 1.49 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: WALNUT,v 1.50 2011/03/06 17:08:23 bouyer Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -80,7 +80,8 @@ file-system UNION # union file system
file-system PTYFS # /dev/pts/N support
# File system options
-options QUOTA # UFS 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 NFSSERVER # Network File System server
diff --git a/sys/arch/ews4800mips/conf/GENERIC b/sys/arch/ews4800mips/conf/GENERIC
index 8868d0a4fc7..ff43c3c67f5 100644
--- a/sys/arch/ews4800mips/conf/GENERIC
+++ b/sys/arch/ews4800mips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.33 2010/11/23 11:13:58 hannken Exp $
+# $NetBSD: GENERIC,v 1.34 2011/03/06 17:08:24 bouyer Exp $
#
# GENERIC machine description file
# This machine description file is used to generate the default NetBSD
@@ -25,7 +25,7 @@ include "arch/ews4800mips/conf/std.ews4800mips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.33 $"
+#ident "GENERIC-$Revision: 1.34 $"
maxusers 16
@@ -115,7 +115,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Indpendent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/ews4800mips/conf/RAMDISK b/sys/arch/ews4800mips/conf/RAMDISK
index 4d7154e7c0d..eca8dafdd1b 100644
--- a/sys/arch/ews4800mips/conf/RAMDISK
+++ b/sys/arch/ews4800mips/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.13 2011/02/08 11:09:14 tsutsui Exp $
+# $NetBSD: RAMDISK,v 1.14 2011/03/06 17:08:24 bouyer Exp $
#
# kernel config file with memory disk for installation
#
@@ -46,6 +46,7 @@ no file-system UNION
no file-system PTYFS
no options QUOTA
+no options QUOTA2
no options NFSSERVER
no options NETATALK
no options PPP_FILTER
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 8a8bca7eda1..c747eab3068 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.164 2011/02/12 15:49:01 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.165 2011/03/06 17:08:24 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.164 $"
+#ident "GENERIC-$Revision: 1.165 $"
maxusers 32 # estimated number of users
@@ -119,7 +119,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# Filesystem options
-options QUOTA # User and group quotas in FFS
+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/hp300/conf/INSTALL b/sys/arch/hp300/conf/INSTALL
index 94e47ef89c8..6d11e53908b 100644
--- a/sys/arch/hp300/conf/INSTALL
+++ b/sys/arch/hp300/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.44 2011/02/12 05:15:39 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.45 2011/03/06 17:08:24 bouyer Exp $
#
# INSTALL machine description file
#
@@ -80,7 +80,8 @@ file-system MFS # Memory-based filesystem
#file-system PTYFS # /dev/pts/N support
# Filesystem options
-#options QUOTA # User and group quotas in FFS
+#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 NFSSERVER # Network filesystem server
diff --git a/sys/arch/hp300/dev/hyperreg.h b/sys/arch/hp300/dev/hyperreg.h
index 21b8c0f588a..e5327555d77 100644
--- a/sys/arch/hp300/dev/hyperreg.h
+++ b/sys/arch/hp300/dev/hyperreg.h
@@ -1,5 +1,4 @@
-/* $OpenBSD: hyperreg.h,v 1.3 2005/01/24 21:36:39 miod Exp $ */
-/* $NetBSD: hyperreg.h,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: hyperreg.h,v 1.3 2011/03/06 17:08:24 bouyer Exp $ */
/*
* Copyright (c) 1991 University of Utah.
diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hp700/conf/GENERIC
index 10101b4eb39..1554d741ef4 100644
--- a/sys/arch/hp700/conf/GENERIC
+++ b/sys/arch/hp700/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.106 2011/02/15 10:32:56 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.107 2011/03/06 17:08:24 bouyer Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hp700/conf/std.hp700"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.106 $"
+#ident "GENERIC-$Revision: 1.107 $"
maxusers 32 # estimated number of users
@@ -110,7 +110,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/hpcarm/conf/IPAQ b/sys/arch/hpcarm/conf/IPAQ
index 2f498f55d4f..33cd970e47d 100644
--- a/sys/arch/hpcarm/conf/IPAQ
+++ b/sys/arch/hpcarm/conf/IPAQ
@@ -1,4 +1,4 @@
-# $NetBSD: IPAQ,v 1.63 2011/01/04 02:19:32 tsutsui Exp $
+# $NetBSD: IPAQ,v 1.64 2011/03/06 17:08:25 bouyer Exp $
#
# iPAQ H3600 -- Windows-CE based PDA
#
@@ -47,7 +47,8 @@ file-system NULLFS # loopback file system
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS 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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/hpcarm/conf/JORNADA720 b/sys/arch/hpcarm/conf/JORNADA720
index 625075f2cce..f3e2298ccd8 100644
--- a/sys/arch/hpcarm/conf/JORNADA720
+++ b/sys/arch/hpcarm/conf/JORNADA720
@@ -1,4 +1,4 @@
-# $NetBSD: JORNADA720,v 1.81 2011/01/04 02:19:32 tsutsui Exp $
+# $NetBSD: JORNADA720,v 1.82 2011/03/06 17:08:25 bouyer Exp $
#
# JORNADA -- Windows-CE based jornada 720
#
@@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.sa11x0"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.81 $"
+#ident "GENERIC-$Revision: 1.82 $"
# estimated number of users
maxusers 32
@@ -51,7 +51,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-#options QUOTA # UFS 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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/hpcarm/conf/JORNADA820 b/sys/arch/hpcarm/conf/JORNADA820
index 4f16a758354..f327265c6d8 100644
--- a/sys/arch/hpcarm/conf/JORNADA820
+++ b/sys/arch/hpcarm/conf/JORNADA820
@@ -1,4 +1,4 @@
-# $NetBSD: JORNADA820,v 1.21 2011/01/04 02:19:32 tsutsui Exp $
+# $NetBSD: JORNADA820,v 1.22 2011/03/06 17:08:25 bouyer Exp $
#
# JORNADA -- Windows-CE based jornada 820
#
@@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.sa11x0"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.21 $"
+#ident "GENERIC-$Revision: 1.22 $"
# estimated number of users
maxusers 32
@@ -49,7 +49,8 @@ file-system KERNFS # /kern
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS 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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/hpcarm/conf/WZERO3 b/sys/arch/hpcarm/conf/WZERO3
index fe6c3eb96a8..ee5c7d5d9d9 100644
--- a/sys/arch/hpcarm/conf/WZERO3
+++ b/sys/arch/hpcarm/conf/WZERO3
@@ -1,4 +1,4 @@
-# $NetBSD: WZERO3,v 1.18 2011/01/04 02:19:32 tsutsui Exp $
+# $NetBSD: WZERO3,v 1.19 2011/03/06 17:08:25 bouyer Exp $
#
# WZERO3 -- Sharp Windows Mobile 5 based PDA
#
@@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.pxa2x0"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.18 $"
+#ident "GENERIC-$Revision: 1.19 $"
# estimated number of users
maxusers 32
@@ -50,7 +50,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-#options QUOTA # UFS 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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/hpcmips/conf/GENERIC b/sys/arch/hpcmips/conf/GENERIC
index fea001e8042..0c7009a0e24 100644
--- a/sys/arch/hpcmips/conf/GENERIC
+++ b/sys/arch/hpcmips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.212 2010/11/23 11:13:59 hannken Exp $
+# $NetBSD: GENERIC,v 1.213 2011/03/06 17:08:25 bouyer Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips.tx39"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.212 $"
+#ident "GENERIC-$Revision: 1.213 $"
maxusers 16
@@ -93,7 +93,8 @@ file-system TMPFS # Efficient memory file-system
options NFSSERVER # Sun NFS-compatible filesystem (server)
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_NO_SNAPSHOT # No FFS snapshot support
# Networking options
diff --git a/sys/arch/hpcmips/conf/LROUTER b/sys/arch/hpcmips/conf/LROUTER
index a3d21bf4c38..86a2162ea4d 100644
--- a/sys/arch/hpcmips/conf/LROUTER
+++ b/sys/arch/hpcmips/conf/LROUTER
@@ -1,5 +1,5 @@
#
-# $NetBSD: LROUTER,v 1.43 2010/11/23 11:13:59 hannken Exp $
+# $NetBSD: LROUTER,v 1.44 2011/03/06 17:08:25 bouyer Exp $
# From: NetBSD: MPC303,v 1.4 2001/11/21 11:28:09 uch Exp
#
# Kernel configuration file for LASER5 L-Router
@@ -75,7 +75,8 @@ file-system PTYFS # /dev/pts/N support
options NFSSERVER # Sun NFS-compatible filesystem (server)
options WAPBL # File system journaling support - Experimental
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_NO_SNAPSHOT # No FFS snapshot support
# Networking options
diff --git a/sys/arch/hpcmips/conf/MPC303 b/sys/arch/hpcmips/conf/MPC303
index f45f9787078..d90d266e510 100644
--- a/sys/arch/hpcmips/conf/MPC303
+++ b/sys/arch/hpcmips/conf/MPC303
@@ -1,5 +1,5 @@
#
-# $NetBSD: MPC303,v 1.56 2010/11/23 11:13:59 hannken Exp $
+# $NetBSD: MPC303,v 1.57 2011/03/06 17:08:25 bouyer Exp $
# From: NetBSD: GENERIC,v 1.91 2001/05/06 14:25:16 takemura Exp
#
# Kernel configuration file for Victor MP-C303; enami's test machine.
@@ -9,7 +9,7 @@ include "arch/hpcmips/conf/std.hpcmips"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.56 $"
+#ident "GENERIC-$Revision: 1.57 $"
maxusers 16
@@ -73,7 +73,8 @@ file-system PTYFS # /dev/pts/N support
#options NFSSERVER # Sun NFS-compatible filesystem (server)
options WAPBL # File system journaling support - Experimental
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
options FFS_NO_SNAPSHOT # No FFS snapshot support
# Networking options
diff --git a/sys/arch/hpcmips/conf/TX3912 b/sys/arch/hpcmips/conf/TX3912
index 3361ad461df..3c48e4683ce 100644
--- a/sys/arch/hpcmips/conf/TX3912
+++ b/sys/arch/hpcmips/conf/TX3912
@@ -2,7 +2,7 @@
# Distribution kernel (TOSHIBA TX3912 based model) kernel config file
#
-# $NetBSD: TX3912,v 1.75 2010/11/23 11:13:59 hannken Exp $
+# $NetBSD: TX3912,v 1.76 2011/03/06 17:08:25 bouyer Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -96,7 +96,8 @@ options INET6 # IPV6
options NFSSERVER # Sun NFS-compatible filesystem (server)
options WAPBL # File system journaling support - Experimental
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
options FFS_NO_SNAPSHOT # No FFS snapshot support
options NFS_BOOT_DHCP
diff --git a/sys/arch/hpcmips/conf/TX3922 b/sys/arch/hpcmips/conf/TX3922
index cd63276780e..3aa53505b45 100644
--- a/sys/arch/hpcmips/conf/TX3922
+++ b/sys/arch/hpcmips/conf/TX3922
@@ -1,7 +1,7 @@
#
# Distribution kernel (TOSHIBA TX3922 based model) kernel config file
#
-# $NetBSD: TX3922,v 1.89 2010/11/23 11:13:59 hannken Exp $
+# $NetBSD: TX3922,v 1.90 2011/03/06 17:08:25 bouyer Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -85,7 +85,8 @@ options INET6 # IPV6
options NFSSERVER # Sun NFS-compatible filesystem (server)
options WAPBL # File system journaling support - Experimental
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
options FFS_NO_SNAPSHOT # No FFS snapshot support
options NFS_BOOT_DHCP
diff --git a/sys/arch/hpcmips/conf/VR41XX b/sys/arch/hpcmips/conf/VR41XX
index 3fc9b6a3a3d..cae009de6bc 100644
--- a/sys/arch/hpcmips/conf/VR41XX
+++ b/sys/arch/hpcmips/conf/VR41XX
@@ -1,4 +1,4 @@
-# $NetBSD: VR41XX,v 1.51 2010/11/23 11:13:59 hannken Exp $
+# $NetBSD: VR41XX,v 1.52 2011/03/06 17:08:25 bouyer Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,7 @@
include "arch/hpcmips/conf/std.hpcmips"
include "arch/hpcmips/conf/std.hpcmips.vr41"
-#ident "GENERIC-$Revision: 1.51 $"
+#ident "GENERIC-$Revision: 1.52 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -86,7 +86,8 @@ file-system PTYFS # /dev/pts/N support
#options NFSSERVER # Sun NFS-compatible filesystem (server)
options WAPBL # File system journaling support - Experimental
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
options FFS_NO_SNAPSHOT # No FFS snapshot support
# Networking options
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index b51ab813fb1..6aad52c829e 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.300 2011/03/04 04:48:40 jruoho Exp $
+# $NetBSD: ALL,v 1.301 2011/03/06 17:08:25 bouyer Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.300 $"
+#ident "ALL-$Revision: 1.301 $"
maxusers 64 # estimated number of users
@@ -194,7 +194,8 @@ file-system ADOSFS # AmigaDOS file system
file-system NILFS # experimental - NTT's NiLFS(2)
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 47857475716..acf9d332b55 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1025 2011/03/04 04:48:40 jruoho Exp $
+# $NetBSD: GENERIC,v 1.1026 2011/03/06 17:08:25 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1025 $"
+#ident "GENERIC-$Revision: 1.1026 $"
maxusers 64 # estimated number of users
@@ -191,7 +191,8 @@ file-system NFS # Network File System client
#file-system NILFS # experimental - NTT's NiLFS(2)
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY
index 176d309d285..f0b4508ed55 100644
--- a/sys/arch/i386/conf/GENERIC_TINY
+++ b/sys/arch/i386/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.126 2010/11/23 11:14:00 hannken Exp $
+# $NetBSD: GENERIC_TINY,v 1.127 2011/03/06 17:08:25 bouyer Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -100,7 +100,8 @@ file-system KERNFS # /kern
#file-system TMPFS # Efficient memory file-system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER # Network File System server
options FFS_NO_SNAPSHOT # No FF snapshot support
diff --git a/sys/arch/i386/conf/INSTALL_FLOPPY b/sys/arch/i386/conf/INSTALL_FLOPPY
index 487b8935251..ac54876a407 100644
--- a/sys/arch/i386/conf/INSTALL_FLOPPY
+++ b/sys/arch/i386/conf/INSTALL_FLOPPY
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.11 2010/11/27 20:18:46 christos Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.12 2011/03/06 17:08:26 bouyer Exp $
#
# INSTALL - Installation kernel.
#
@@ -119,7 +119,8 @@ file-system MSDOSFS # MS-DOS file system
file-system TMPFS # Efficient memory file-system
# Filesystem options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options NFSSERVER # Network File System server
options NFS_V2_ONLY # Exclude NFS3 code to save space
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/i386/conf/INSTALL_TINY b/sys/arch/i386/conf/INSTALL_TINY
index 656a932ecea..6420c5b78e2 100644
--- a/sys/arch/i386/conf/INSTALL_TINY
+++ b/sys/arch/i386/conf/INSTALL_TINY
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.131 2010/11/23 11:14:00 hannken Exp $
+# $NetBSD: INSTALL_TINY,v 1.132 2011/03/06 17:08:26 bouyer Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -107,7 +107,8 @@ file-system MSDOSFS # MS-DOS file system
#file-system TMPFS # Efficient memory file-system
# Filesystem options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options NFSSERVER # Network File System server
options NFS_V2_ONLY # Exclude NFS3 code to save space
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/i386/conf/MONOLITHIC b/sys/arch/i386/conf/MONOLITHIC
index 8595f8de98f..31f83e92067 100644
--- a/sys/arch/i386/conf/MONOLITHIC
+++ b/sys/arch/i386/conf/MONOLITHIC
@@ -1,4 +1,4 @@
-# $NetBSD: MONOLITHIC,v 1.14 2011/02/13 04:42:54 jym Exp $
+# $NetBSD: MONOLITHIC,v 1.15 2011/03/06 17:08:26 bouyer Exp $
#
# Non MODULAR, used mostly as a reference as to what we modularized.
#
@@ -43,7 +43,8 @@ file-system PTYFS # /dev/ptm support
file-system TMPFS # Efficient memory file-system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
options NFSSERVER
diff --git a/sys/arch/i386/conf/NET4501 b/sys/arch/i386/conf/NET4501
index f36b8b9607c..28be2c58546 100644
--- a/sys/arch/i386/conf/NET4501
+++ b/sys/arch/i386/conf/NET4501
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.72 2010/04/16 13:48:32 pooka Exp $
+# $NetBSD: NET4501,v 1.73 2011/03/06 17:08:26 bouyer Exp $
#
# NET4501 -- kernel configuration for a Soekris Engineering net4501
# single-board computer.
@@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NET4501-$Revision: 1.72 $"
+#ident "NET4501-$Revision: 1.73 $"
maxusers 32 # estimated number of users
@@ -123,7 +123,8 @@ file-system PTYFS # /dev/pts/N support
#file-system TMPFS # Efficient memory file-system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
#options FFS_NO_SNAPSHOT # No FFS snapshot support
#options NFSSERVER # Network File System server
diff --git a/sys/arch/i386/conf/XEN3_DOM0 b/sys/arch/i386/conf/XEN3_DOM0
index 31a63c288fa..f4e4bc22787 100644
--- a/sys/arch/i386/conf/XEN3_DOM0
+++ b/sys/arch/i386/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.46 2011/02/24 10:56:01 jruoho Exp $
+# $NetBSD: XEN3_DOM0,v 1.47 2011/03/06 17:08:26 bouyer Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -131,7 +131,8 @@ file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/i386/conf/XEN3_DOMU b/sys/arch/i386/conf/XEN3_DOMU
index 0eb96e48451..3b9c10280a5 100644
--- a/sys/arch/i386/conf/XEN3_DOMU
+++ b/sys/arch/i386/conf/XEN3_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.28 2011/02/17 22:00:36 jym Exp $
+# $NetBSD: XEN3_DOMU,v 1.29 2011/03/06 17:08:26 bouyer Exp $
include "arch/xen/conf/std.xen"
@@ -111,7 +111,8 @@ file-system TMPFS # Efficient memory file-system
file-system NILFS # experimental - NTT's NiLFS(2)
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/iyonix/conf/GENERIC b/sys/arch/iyonix/conf/GENERIC
index a0b76e33b49..2743cbb815f 100644
--- a/sys/arch/iyonix/conf/GENERIC
+++ b/sys/arch/iyonix/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.61 2010/11/23 11:14:01 hannken Exp $
+# $NetBSD: GENERIC,v 1.62 2011/03/06 17:08:26 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.61 $"
+#ident "GENERIC-$Revision: 1.62 $"
maxusers 32 # estimated number of users
@@ -138,7 +138,8 @@ file-system MSDOSFS # MS-DOS file system
file-system FILECORE # Acorn filecore file system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index 1ccd3926781..e84f29c1727 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.27 2011/01/03 06:07:43 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.28 2011/03/06 17:08:26 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.27 $"
+#ident "GENERIC-$Revision: 1.28 $"
maxusers 16 # estimated number of users
@@ -118,7 +118,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/luna68k/conf/GENERIC b/sys/arch/luna68k/conf/GENERIC
index 6776a146604..0ad295489fc 100644
--- a/sys/arch/luna68k/conf/GENERIC
+++ b/sys/arch/luna68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.91 2010/11/23 11:14:01 hannken Exp $
+# $NetBSD: GENERIC,v 1.92 2011/03/06 17:08:26 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/luna68k/conf/std.luna68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.91 $"
+#ident "GENERIC-$Revision: 1.92 $"
maxusers 8
@@ -93,7 +93,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 independent support
options WAPBL # File system journaling support - Experimental
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 61b0d7602d2..e08eb5fc0ab 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.199 2010/11/24 13:54:49 hauke Exp $
+# $NetBSD: GENERIC,v 1.200 2011/03/06 17:08:27 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mac68k/conf/std.mac68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.199 $"
+#ident "GENERIC-$Revision: 1.200 $"
maxusers 16 # estimated number of users
@@ -121,7 +121,8 @@ file-system TMPFS # Efficient memory file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
# File system options
-options QUOTA # UFS 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/mac68k/conf/SMALLRAM b/sys/arch/mac68k/conf/SMALLRAM
index 7ce9a8269b7..63d3b5bde03 100644
--- a/sys/arch/mac68k/conf/SMALLRAM
+++ b/sys/arch/mac68k/conf/SMALLRAM
@@ -1,4 +1,4 @@
-# $NetBSD: SMALLRAM,v 1.37 2010/11/24 13:48:20 hauke Exp $
+# $NetBSD: SMALLRAM,v 1.38 2011/03/06 17:08:27 bouyer Exp $
#
# This is an example of how to configure a small, efficient kernel for
# a system with limited RAM. Even so it's capable of doing quite a
@@ -65,6 +65,7 @@ no file-system PTYFS
no file-system TMPFS
no options QUOTA
+no options QUOTA2
no options WAPBL
no options NFSSERVER
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index c08b43c8909..11b2aecb2e3 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.288 2011/01/03 06:07:43 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.289 2011/03/06 17:08:27 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.288 $"
+#ident "GENERIC-$Revision: 1.289 $"
maxusers 32
@@ -110,7 +110,8 @@ file-system TMPFS # Efficient memory file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
# File system options
-options QUOTA # UFS 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/macppc/conf/MAMBO b/sys/arch/macppc/conf/MAMBO
index 27f007be1df..85a1ea98ecf 100644
--- a/sys/arch/macppc/conf/MAMBO
+++ b/sys/arch/macppc/conf/MAMBO
@@ -6,7 +6,7 @@ include "arch/macppc/conf/std.macppc.g5"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.11 $"
+#ident "GENERIC-$Revision: 1.12 $"
maxusers 32
@@ -81,7 +81,8 @@ file-system UNION # union file system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
#options FFS_NO_SNAPSHOT # ffs snapshots
diff --git a/sys/arch/macppc/conf/POWERMAC_G5 b/sys/arch/macppc/conf/POWERMAC_G5
index 3fc5878d4f6..506ba1bc6e1 100644
--- a/sys/arch/macppc/conf/POWERMAC_G5
+++ b/sys/arch/macppc/conf/POWERMAC_G5
@@ -66,7 +66,8 @@ file-system PROCFS # /proc
file-system NFS # Network File System client
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
#options NFSSERVER # Network File System server
diff --git a/sys/arch/mipsco/conf/GENERIC b/sys/arch/mipsco/conf/GENERIC
index 28cb7ae93be..c4b9706be44 100644
--- a/sys/arch/mipsco/conf/GENERIC
+++ b/sys/arch/mipsco/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.75 2010/04/29 22:40:52 chs Exp $
+# $NetBSD: GENERIC,v 1.76 2011/03/06 17:08:27 bouyer Exp $
#
# GENERIC machine description file
#
@@ -91,7 +91,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
#
options NFSSERVER # Sun NFS-compatible filesystem server
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/mipsco/conf/RC3230 b/sys/arch/mipsco/conf/RC3230
index 7a2e8a6aef8..6e2831c42e1 100644
--- a/sys/arch/mipsco/conf/RC3230
+++ b/sys/arch/mipsco/conf/RC3230
@@ -1,5 +1,5 @@
#
-# $NetBSD: RC3230,v 1.38 2010/04/16 13:48:33 pooka Exp $
+# $NetBSD: RC3230,v 1.39 2011/03/06 17:08:27 bouyer Exp $
#
include "arch/mipsco/conf/std.mipsco"
@@ -65,7 +65,8 @@ file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system PTYFS # /dev/pts/N support
#
options NFSSERVER # Sun NFS-compatible filesystem server
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/mmeye/conf/GENERIC b/sys/arch/mmeye/conf/GENERIC
index 10353993019..9164188ce21 100644
--- a/sys/arch/mmeye/conf/GENERIC
+++ b/sys/arch/mmeye/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.104 2011/02/19 10:46:27 kiyohara Exp $
+# $NetBSD: GENERIC,v 1.105 2011/03/06 17:08:27 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.104 $"
+#ident "GENERIC-$Revision: 1.105 $"
maxusers 16 # estimated number of users
@@ -103,7 +103,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-#options QUOTA # UFS 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/mmeye/conf/MMTA b/sys/arch/mmeye/conf/MMTA
index b09f5b39ce3..64168f3bf39 100644
--- a/sys/arch/mmeye/conf/MMTA
+++ b/sys/arch/mmeye/conf/MMTA
@@ -1,4 +1,4 @@
-# $NetBSD: MMTA,v 1.44 2011/02/19 10:46:27 kiyohara Exp $
+# $NetBSD: MMTA,v 1.45 2011/03/06 17:08:27 bouyer Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -77,7 +77,8 @@ file-system UMAPFS # NULLFS + uid and gid remapping
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
options NFSSERVER # Network File System server
#options FIFO # FIFOs; RECOMMENDED
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/mmeye/conf/MMTAICE b/sys/arch/mmeye/conf/MMTAICE
index b7e70b211cd..58a0cba2732 100644
--- a/sys/arch/mmeye/conf/MMTAICE
+++ b/sys/arch/mmeye/conf/MMTAICE
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAICE,v 1.46 2011/02/19 10:46:27 kiyohara Exp $
+# $NetBSD: MMTAICE,v 1.47 2011/03/06 17:08:28 bouyer Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -108,7 +108,8 @@ file-system UMAPFS # NULLFS + uid and gid remapping
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
options NFSSERVER # Network File System server
#options FIFO # FIFOs; RECOMMENDED
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/mmeye/conf/MMTAROMNEW b/sys/arch/mmeye/conf/MMTAROMNEW
index ce2c90ffe8d..8eeba9c1477 100644
--- a/sys/arch/mmeye/conf/MMTAROMNEW
+++ b/sys/arch/mmeye/conf/MMTAROMNEW
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAROMNEW,v 1.45 2011/02/19 10:46:27 kiyohara Exp $
+# $NetBSD: MMTAROMNEW,v 1.46 2011/03/06 17:08:28 bouyer Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -87,7 +87,8 @@ file-system UMAPFS # NULLFS + uid and gid remapping
file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options NFSSERVER # Network File System server
options FFS_NO_SNAPSHOT # No FFS snapshot support
#options FIFO # FIFOs; RECOMMENDED
diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC
index 72cf7f5a431..ee4a4549148 100644
--- a/sys/arch/mvmeppc/conf/GENERIC
+++ b/sys/arch/mvmeppc/conf/GENERIC
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.11 2011/01/31 06:33:05 matt Exp $
+# $NetBSD: GENERIC,v 1.12 2011/03/06 17:08:28 bouyer Exp $
#
include "arch/mvmeppc/conf/std.mvmeppc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.11 $"
+ident "GENERIC-$Revision: 1.12 $"
maxusers 8
@@ -57,7 +57,8 @@ file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options FFS_NO_SNAPSHOT # No FFS snapshot support
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/netwinder/conf/GENERIC b/sys/arch/netwinder/conf/GENERIC
index f342b3a5eec..6abe6c94340 100644
--- a/sys/arch/netwinder/conf/GENERIC
+++ b/sys/arch/netwinder/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.102 2010/11/23 11:14:03 hannken Exp $
+# $NetBSD: GENERIC,v 1.103 2011/03/06 17:08:28 bouyer Exp $
#
# GENERIC machine description file
#
@@ -72,7 +72,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options FFS_NO_SNAPSHOT # No FFS snapshot support
options NFSSERVER
diff --git a/sys/arch/news68k/conf/GENERIC b/sys/arch/news68k/conf/GENERIC
index 53ed582a415..4fa6f036e8a 100644
--- a/sys/arch/news68k/conf/GENERIC
+++ b/sys/arch/news68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.105 2011/03/06 14:54:46 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.106 2011/03/06 17:08:28 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/news68k/conf/std.news68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.105 $"
+#ident "GENERIC-$Revision: 1.106 $"
maxusers 8
@@ -102,7 +102,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 independent support
options WAPBL # File system journaling support - Experimental
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/news68k/conf/GENERIC_TINY b/sys/arch/news68k/conf/GENERIC_TINY
index bb6f9c085de..c9d7895031e 100644
--- a/sys/arch/news68k/conf/GENERIC_TINY
+++ b/sys/arch/news68k/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.67 2010/11/23 11:14:03 hannken Exp $
+# $NetBSD: GENERIC_TINY,v 1.68 2011/03/06 17:08:28 bouyer Exp $
# news68k GENERIC config file for low memory machines;
#
@@ -6,7 +6,7 @@ include "arch/news68k/conf/std.news68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC_TINY-$Revision: 1.67 $"
+#ident "GENERIC_TINY-$Revision: 1.68 $"
maxusers 4
@@ -80,7 +80,8 @@ file-system FDESC # /dev/fd/*
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 independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/news68k/conf/INSTALL b/sys/arch/news68k/conf/INSTALL
index 0f9f94360d6..3ed0b7398db 100644
--- a/sys/arch/news68k/conf/INSTALL
+++ b/sys/arch/news68k/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.51 2010/11/23 11:14:03 hannken Exp $
+# $NetBSD: INSTALL,v 1.52 2011/03/06 17:08:28 bouyer Exp $
# config for bootable floppy kernel
#
@@ -66,7 +66,8 @@ file-system MSDOSFS # MS-DOS FAT file system
# Filesystem options
#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 independent support
options NFS_V2_ONLY # Exclude NFS3 code to save space
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/news68k/conf/LIBERO b/sys/arch/news68k/conf/LIBERO
index 54b39be3b04..40cc826de64 100644
--- a/sys/arch/news68k/conf/LIBERO
+++ b/sys/arch/news68k/conf/LIBERO
@@ -1,4 +1,4 @@
-# $NetBSD: LIBERO,v 1.53 2010/11/23 11:14:03 hannken Exp $
+# $NetBSD: LIBERO,v 1.54 2011/03/06 17:08:28 bouyer Exp $
# NEWS1750 config file;
#
@@ -70,7 +70,8 @@ file-system NULLFS # loopback 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 independent support
options FFS_NO_SNAPSHOT # FFS snapshot support
diff --git a/sys/arch/news68k/conf/NEWS1200 b/sys/arch/news68k/conf/NEWS1200
index 8602a27ac15..b3d65d73270 100644
--- a/sys/arch/news68k/conf/NEWS1200
+++ b/sys/arch/news68k/conf/NEWS1200
@@ -1,4 +1,4 @@
-# $NetBSD: NEWS1200,v 1.49 2010/11/23 11:14:03 hannken Exp $
+# $NetBSD: NEWS1200,v 1.50 2011/03/06 17:08:28 bouyer Exp $
# news1200 config file
#
@@ -71,7 +71,8 @@ file-system NULLFS # loopback 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 independent support
options WAPBL # File system journaling support - Experimental
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/newsmips/conf/GENERIC b/sys/arch/newsmips/conf/GENERIC
index c9c81513423..90f754fb526 100644
--- a/sys/arch/newsmips/conf/GENERIC
+++ b/sys/arch/newsmips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.111 2010/04/29 22:40:52 chs Exp $
+# $NetBSD: GENERIC,v 1.112 2011/03/06 17:08:29 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/newsmips/conf/std.newsmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.111 $"
+#ident "GENERIC-$Revision: 1.112 $"
maxusers 16
@@ -92,7 +92,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
options NFSSERVER # Sun NFS-compatible filesystem server
-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/next68k/conf/GENERIC b/sys/arch/next68k/conf/GENERIC
index 8b7f7903f95..d900e0f0116 100644
--- a/sys/arch/next68k/conf/GENERIC
+++ b/sys/arch/next68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.122 2010/11/23 11:14:03 hannken Exp $
+# $NetBSD: GENERIC,v 1.123 2011/03/06 17:08:29 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/next68k/conf/std.next68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.122 $"
+#ident "GENERIC-$Revision: 1.123 $"
# Needs to be set per system. i.e change these as you see fit
maxusers 16
@@ -116,7 +116,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 WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/next68k/conf/SLAB b/sys/arch/next68k/conf/SLAB
index 2310b00098e..650a4e3921a 100644
--- a/sys/arch/next68k/conf/SLAB
+++ b/sys/arch/next68k/conf/SLAB
@@ -1,4 +1,4 @@
-# $NetBSD: SLAB,v 1.42 2010/11/23 11:14:03 hannken Exp $
+# $NetBSD: SLAB,v 1.43 2011/03/06 17:08:29 bouyer Exp $
#
# deberg's development machine
#
@@ -86,7 +86,8 @@ file-system NULLFS # loopback 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 EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
diff --git a/sys/arch/ofppc/conf/GENERIC b/sys/arch/ofppc/conf/GENERIC
index d7d8a3b106b..1ee305e9301 100644
--- a/sys/arch/ofppc/conf/GENERIC
+++ b/sys/arch/ofppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.135 2011/01/02 11:25:31 mrg Exp $
+# $NetBSD: GENERIC,v 1.136 2011/03/06 17:08:29 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.135 $"
+#ident "GENERIC-$Revision: 1.136 $"
maxusers 32
@@ -110,7 +110,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/ofppc/conf/GENERIC.MP b/sys/arch/ofppc/conf/GENERIC.MP
index 1871eaf615f..58834e2925b 100644
--- a/sys/arch/ofppc/conf/GENERIC.MP
+++ b/sys/arch/ofppc/conf/GENERIC.MP
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.MP,v 1.14 2010/12/31 21:50:27 phx Exp $
+# $NetBSD: GENERIC.MP,v 1.15 2011/03/06 17:08:29 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.14 $"
+#ident "GENERIC-$Revision: 1.15 $"
maxusers 32
@@ -108,7 +108,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index 5e3fc72b206..f7fb07c80d4 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.167 2011/02/20 07:50:24 matt Exp $
+# $NetBSD: GENERIC,v 1.168 2011/03/06 17:08:29 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.167 $"
+#ident "GENERIC-$Revision: 1.168 $"
maxusers 64
@@ -97,7 +97,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
options NFSSERVER # Sun NFS-compatible filesystem (server)
-options QUOTA # UFS 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 FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/pmax/conf/GENERIC64 b/sys/arch/pmax/conf/GENERIC64
index a53d50112e9..0c9dd22680b 100644
--- a/sys/arch/pmax/conf/GENERIC64
+++ b/sys/arch/pmax/conf/GENERIC64
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.5 2011/02/20 07:50:24 matt Exp $
+# $NetBSD: GENERIC64,v 1.6 2011/03/06 17:08:29 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.5 $"
+#ident "GENERIC-$Revision: 1.6 $"
maxusers 64
@@ -88,7 +88,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
options NFSSERVER # Sun NFS-compatible filesystem (server)
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
options SOFTDEP # FFS soft updates support.
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC
index f88a8b7ffcf..cf34471f9dd 100644
--- a/sys/arch/prep/conf/GENERIC
+++ b/sys/arch/prep/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.157 2010/11/23 11:14:04 hannken Exp $
+# $NetBSD: GENERIC,v 1.158 2011/03/06 17:08:30 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.157 $"
+#ident "GENERIC-$Revision: 1.158 $"
maxusers 32
@@ -97,7 +97,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS 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/rs6000/conf/GENERIC b/sys/arch/rs6000/conf/GENERIC
index 7b2fdec6eba..b368a15a0be 100644
--- a/sys/arch/rs6000/conf/GENERIC
+++ b/sys/arch/rs6000/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.15 2010/11/23 11:14:04 hannken Exp $
+# $NetBSD: GENERIC,v 1.16 2011/03/06 17:08:30 bouyer Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#makeoptions COPTS="-O2 -mno-powerpc -mno-power" # wheeee
-#ident "GENERIC-$Revision: 1.15 $"
+#ident "GENERIC-$Revision: 1.16 $"
maxusers 32
@@ -103,7 +103,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-options QUOTA # UFS 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/sandpoint/conf/GENERIC b/sys/arch/sandpoint/conf/GENERIC
index c440c9a9143..991d711dc07 100644
--- a/sys/arch/sandpoint/conf/GENERIC
+++ b/sys/arch/sandpoint/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.54 2011/02/13 20:37:26 phx Exp $
+# $NetBSD: GENERIC,v 1.55 2011/03/06 17:08:30 bouyer Exp $
#
# machine description file for GENERIC NAS
#
@@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpoint"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.54 $"
+#ident "GENERIC-$Revision: 1.55 $"
maxusers 32
@@ -94,7 +94,8 @@ file-system PTYFS # /dev/ptm support
file-system TMPFS # Efficient memory file-system
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
options NFSSERVER # Network File System server
diff --git a/sys/arch/sbmips/conf/GENERIC b/sys/arch/sbmips/conf/GENERIC
index 130bfe5cd93..a2d4a331a61 100644
--- a/sys/arch/sbmips/conf/GENERIC
+++ b/sys/arch/sbmips/conf/GENERIC
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.81 2011/02/20 07:47:38 matt Exp $
+# $NetBSD: GENERIC,v 1.82 2011/03/06 17:08:30 bouyer Exp $
include "arch/sbmips/conf/std.sbmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.81 $"
+#ident "GENERIC-$Revision: 1.82 $"
#options LOCKDEBUG # XXX XXX XXX XXX
#options DEBUG # extra kernel debugging support
@@ -74,7 +74,8 @@ file-system TMPFS # Efficient memory file-system
# File system options
options NFSSERVER # Sun NFS-compatible filesystem server
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_NO_SNAPSHOT # No FFS snapshot support
#options FFS_EI # FFS Endian Independant support
options WAPBL # File system journaling support - Experimental
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP12 b/sys/arch/sgimips/conf/GENERIC32_IP12
index 97df180eb58..080a99274c3 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP12
+++ b/sys/arch/sgimips/conf/GENERIC32_IP12
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP12,v 1.9 2011/03/05 23:38:40 joerg Exp $
+# $NetBSD: GENERIC32_IP12,v 1.10 2011/03/06 17:08:30 bouyer Exp $
#
# GENERIC32_IP12 machine description file
#
@@ -32,7 +32,7 @@ makeoptions TEXTADDR=0x80002000 # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.9 $"
+#ident "GENERIC32-IP2x-$Revision: 1.10 $"
maxusers 32
@@ -114,7 +114,8 @@ file-system TMPFS # Efficient memory file-system
file-system EFS # Silicon Graphics Extent File System
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP2x b/sys/arch/sgimips/conf/GENERIC32_IP2x
index 29479815826..a9ff3893635 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP2x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP2x
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP2x,v 1.85 2011/03/05 23:38:40 joerg Exp $
+# $NetBSD: GENERIC32_IP2x,v 1.86 2011/03/06 17:08:30 bouyer Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.85 $"
+#ident "GENERIC32-IP2x-$Revision: 1.86 $"
maxusers 32
@@ -115,7 +115,8 @@ file-system TMPFS # Efficient memory file-system
file-system EFS # Silicon Graphics Extent File System
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP3x b/sys/arch/sgimips/conf/GENERIC32_IP3x
index ce1a1095353..33142e75d3c 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP3x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP3x
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.87 2011/03/05 23:38:40 joerg Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.88 2011/03/06 17:08:31 bouyer Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.87 $"
+#ident "GENERIC32_IP3x-$Revision: 1.88 $"
maxusers 32
@@ -108,7 +108,8 @@ file-system TMPFS # Efficient memory file-system
file-system EFS # Silicon Graphics Extent File System
# File system options
-options QUOTA # UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/shark/conf/GENERIC b/sys/arch/shark/conf/GENERIC
index fbe611ace4c..9c5e502b5e1 100644
--- a/sys/arch/shark/conf/GENERIC
+++ b/sys/arch/shark/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.92 2011/01/03 06:07:44 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.93 2011/03/06 17:08:31 bouyer Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.92 $"
+#ident "GENERIC-$Revision: 1.93 $"
# estimated number of users
maxusers 32
@@ -61,7 +61,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-#options QUOTA # UFS 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/shark/conf/INSTALL b/sys/arch/shark/conf/INSTALL
index 480f5e8313b..ace19456c26 100644
--- a/sys/arch/shark/conf/INSTALL
+++ b/sys/arch/shark/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.45 2010/11/23 11:14:05 hannken Exp $
+# $NetBSD: INSTALL,v 1.46 2011/03/06 17:08:31 bouyer Exp $
#
# Shark installation kernel
#
@@ -56,7 +56,8 @@ file-system KERNFS # /kern
#file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/shark/conf/OFWGENCFG b/sys/arch/shark/conf/OFWGENCFG
index ab3ff84584a..958ce59035d 100644
--- a/sys/arch/shark/conf/OFWGENCFG
+++ b/sys/arch/shark/conf/OFWGENCFG
@@ -1,4 +1,4 @@
-# $NetBSD: OFWGENCFG,v 1.36 2010/11/23 11:14:05 hannken Exp $
+# $NetBSD: OFWGENCFG,v 1.37 2011/03/06 17:08:31 bouyer Exp $
#
# OFWGENCFG: 'generic' configuration for Open Firmware boards.
#
@@ -53,7 +53,8 @@ file-system KERNFS # /kern
#file-system PTYFS # /dev/pts/N support
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options NFSSERVER
options NFS_BOOT_DHCP # NFS booting via DHCP
options NFS_BOOT_RWSIZE=1024 # OFW driver can't cope with more
diff --git a/sys/arch/sparc/conf/BILL-THE-CAT b/sys/arch/sparc/conf/BILL-THE-CAT
index 4f928a48063..a50fddc40b9 100644
--- a/sys/arch/sparc/conf/BILL-THE-CAT
+++ b/sys/arch/sparc/conf/BILL-THE-CAT
@@ -1,4 +1,4 @@
-# $NetBSD: BILL-THE-CAT,v 1.49 2010/11/23 11:14:06 hannken Exp $
+# $NetBSD: BILL-THE-CAT,v 1.50 2011/03/06 17:08:31 bouyer Exp $
# From: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
include "arch/sparc/conf/std.sparc"
@@ -155,7 +155,8 @@ file-system PTYFS # /dev/pts/N support
## File system options.
#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/sparc/conf/INSTALL b/sys/arch/sparc/conf/INSTALL
index a28f15ed2b3..06d4ebc86fc 100644
--- a/sys/arch/sparc/conf/INSTALL
+++ b/sys/arch/sparc/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.77 2010/11/23 11:14:06 hannken Exp $
+# $NetBSD: INSTALL,v 1.78 2011/03/06 17:08:31 bouyer Exp $
#
# from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
#
@@ -181,7 +181,8 @@ file-system CD9660 # ISO 9660 + Rock Ridge file system
## File system options
#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
#options NFS_V2_ONLY # Exclude NFS3 code to save space
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/sparc/conf/KRUPS b/sys/arch/sparc/conf/KRUPS
index a74163769c3..d2d00c3a52d 100644
--- a/sys/arch/sparc/conf/KRUPS
+++ b/sys/arch/sparc/conf/KRUPS
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.54 2011/01/17 13:43:02 jdc Exp $
+# $NetBSD: KRUPS,v 1.55 2011/03/06 17:08:31 bouyer Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "KRUPS-$Revision: 1.54 $"
+#ident "KRUPS-$Revision: 1.55 $"
maxusers 32
@@ -209,7 +209,8 @@ file-system PTYFS # /dev/pts/N support
## File system options.
#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/sparc/conf/MRCOFFEE b/sys/arch/sparc/conf/MRCOFFEE
index 4625846122d..4f9b611722a 100644
--- a/sys/arch/sparc/conf/MRCOFFEE
+++ b/sys/arch/sparc/conf/MRCOFFEE
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.32 2011/01/17 13:43:02 jdc Exp $
+# $NetBSD: MRCOFFEE,v 1.33 2011/03/06 17:08:31 bouyer Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MRCOFFEE-$Revision: 1.32 $"
+#ident "MRCOFFEE-$Revision: 1.33 $"
maxusers 32
@@ -190,7 +190,8 @@ file-system PTYFS # /dev/pts/N support
## File system options.
#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/sparc/conf/TADPOLE3GX b/sys/arch/sparc/conf/TADPOLE3GX
index 5e959adb78f..edc0df1b554 100644
--- a/sys/arch/sparc/conf/TADPOLE3GX
+++ b/sys/arch/sparc/conf/TADPOLE3GX
@@ -1,4 +1,4 @@
-# $NetBSD: TADPOLE3GX,v 1.52 2011/01/17 13:43:02 jdc Exp $
+# $NetBSD: TADPOLE3GX,v 1.53 2011/03/06 17:08:31 bouyer Exp $
include "arch/sparc/conf/std.sparc"
@@ -167,7 +167,8 @@ file-system PTYFS # /dev/pts/N support
## File system options.
options NFSSERVER # Sun NFS-compatible filesystem server
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index e7cd0fc629a..5f8f5af5715 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.133 2010/12/16 09:35:31 martin Exp $
+# $NetBSD: GENERIC,v 1.134 2011/03/06 17:08:31 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.133 $"
+#ident "GENERIC-$Revision: 1.134 $"
maxusers 64
@@ -184,7 +184,8 @@ file-system TMPFS # Efficient memory file-system
## File system options.
options NFSSERVER # Sun NFS-compatible filesystem server
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options FFS_NO_SNAPSHOT # No FFS snapshot support
diff --git a/sys/arch/sparc64/conf/NONPLUS64 b/sys/arch/sparc64/conf/NONPLUS64
index fe463575f43..dbaf5c6e6d9 100644
--- a/sys/arch/sparc64/conf/NONPLUS64
+++ b/sys/arch/sparc64/conf/NONPLUS64
@@ -1,8 +1,8 @@
-# $NetBSD: NONPLUS64,v 1.32 2010/11/23 11:14:06 hannken Exp $
+# $NetBSD: NONPLUS64,v 1.33 2011/03/06 17:08:31 bouyer Exp $
include "arch/sparc64/conf/std.sparc64"
-#ident "NONPLUS64-$Revision: 1.32 $"
+#ident "NONPLUS64-$Revision: 1.33 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -150,7 +150,8 @@ file-system PTYFS # /dev/pts/N support
## File system options.
options NFSSERVER # Sun NFS-compatible filesystem server
-options QUOTA # FFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
#options FFS_NO_SNAPSHOT # No FFS snapshot support
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
diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index 02db95946ed..6d437409d81 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.61 2009/03/06 20:31:53 joerg Exp $
+# $NetBSD: DISKLESS,v 1.62 2011/03/06 17:08:32 bouyer Exp $
# DISKLESS - Root and swap on NFS
# Desktop machines only (3/50, 3/60, 3/110)
@@ -73,7 +73,8 @@ file-system NFS # Sun NFS client support
#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
# Networking options
diff --git a/sys/arch/sun3/conf/DISKLESS3X b/sys/arch/sun3/conf/DISKLESS3X
index b238025ef71..1b769c8dd7d 100644
--- a/sys/arch/sun3/conf/DISKLESS3X
+++ b/sys/arch/sun3/conf/DISKLESS3X
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS3X,v 1.48 2009/03/06 20:31:53 joerg Exp $
+# $NetBSD: DISKLESS3X,v 1.49 2011/03/06 17:08:32 bouyer Exp $
# DISKLESS - Root and swap on NFS
# Desktop machines only (3/80)
@@ -74,7 +74,8 @@ file-system NFS # Sun NFS client support
#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
# Networking options
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index 19b74f9375c..9ef39158e3e 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.154 2011/01/03 06:07:44 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.155 2011/03/06 17:08:32 bouyer Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun3/conf/std.sun3"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.154 $"
+#ident "GENERIC-$Revision: 1.155 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -108,7 +108,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/sun3/conf/GENERIC3X b/sys/arch/sun3/conf/GENERIC3X
index 04a3c091b21..e684da9edc9 100644
--- a/sys/arch/sun3/conf/GENERIC3X
+++ b/sys/arch/sun3/conf/GENERIC3X
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.110 2011/01/03 06:07:44 tsutsui Exp $
+# $NetBSD: GENERIC3X,v 1.111 2011/03/06 17:08:32 bouyer Exp $
# GENERIC Sun3X (3/80, 3/470)
# Supports root on: ie0, le0, sd*, ...
@@ -7,7 +7,7 @@ include "arch/sun3/conf/std.sun3x"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC3X-$Revision: 1.110 $"
+#ident "GENERIC3X-$Revision: 1.111 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -91,7 +91,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/sun3/conf/INSTALL b/sys/arch/sun3/conf/INSTALL
index ed814384d29..d66a2facd96 100644
--- a/sys/arch/sun3/conf/INSTALL
+++ b/sys/arch/sun3/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.47 2010/11/23 11:14:06 hannken Exp $
+# $NetBSD: INSTALL,v 1.48 2011/03/06 17:08:32 bouyer Exp $
#
# INSTALL - Installation kernel for the Sun3
#
@@ -78,7 +78,8 @@ file-system KERNFS # /kern
# Filesystem options
#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/sun3/conf/INSTALL3X b/sys/arch/sun3/conf/INSTALL3X
index 0583b34434a..77f7671c390 100644
--- a/sys/arch/sun3/conf/INSTALL3X
+++ b/sys/arch/sun3/conf/INSTALL3X
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL3X,v 1.46 2010/11/23 11:14:06 hannken Exp $
+# $NetBSD: INSTALL3X,v 1.47 2011/03/06 17:08:32 bouyer Exp $
#
# INSTALL3X - Installation kernel for the Sun3X
#
@@ -78,7 +78,8 @@ file-system KERNFS # /kern
# Filesystem options
#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/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 1f4a6b1dd6f..60b28919f45 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.175 2010/08/08 18:19:26 chs Exp $
+# $NetBSD: GENERIC,v 1.176 2011/03/06 17:08:32 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.175 $"
+#ident "GENERIC-$Revision: 1.176 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -115,7 +115,8 @@ file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
-options QUOTA
+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/vax/conf/INSTALL b/sys/arch/vax/conf/INSTALL
index 43f37b364a9..c8b5041158b 100644
--- a/sys/arch/vax/conf/INSTALL
+++ b/sys/arch/vax/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.54 2010/11/23 11:14:07 hannken Exp $
+# $NetBSD: INSTALL,v 1.55 2011/03/06 17:08:32 bouyer Exp $
#
# INSTALL kernel; all supported devices but nothing fancy.
#
@@ -63,7 +63,8 @@ file-system CD9660
#file-system PTYFS # /dev/pts/N support
# Filesystem options
-#options QUOTA
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
#options NFS_V2_ONLY # Exclude NFS3 code to save space
diff --git a/sys/arch/vax/conf/VAX780 b/sys/arch/vax/conf/VAX780
index 47ec82308f3..73451585cd1 100644
--- a/sys/arch/vax/conf/VAX780
+++ b/sys/arch/vax/conf/VAX780
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.3 2010/04/16 13:48:36 pooka Exp $
+# $NetBSD: VAX780,v 1.4 2011/03/06 17:08:32 bouyer Exp $
#
# 11/780,750,730 machine description file
#
@@ -99,7 +99,8 @@ file-system PTYFS # /dev/pts/N support
#file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
-options QUOTA
+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/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC
index 1309e32ca21..1867fe13476 100644
--- a/sys/arch/x68k/conf/GENERIC
+++ b/sys/arch/x68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.153 2011/01/03 06:15:16 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.154 2011/03/06 17:08:33 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.153 $"
+#ident "GENERIC-$Revision: 1.154 $"
maxusers 8
@@ -190,7 +190,8 @@ file-system TMPFS # Efficient memory file-system
## File system options.
options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
diff --git a/sys/arch/x68k/conf/INSTALL b/sys/arch/x68k/conf/INSTALL
index 7b7d763de96..c917c1720ff 100644
--- a/sys/arch/x68k/conf/INSTALL
+++ b/sys/arch/x68k/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.90 2010/11/23 11:14:07 hannken Exp $
+# $NetBSD: INSTALL,v 1.91 2011/03/06 17:08:33 bouyer Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.90 $"
+#ident "INSTALL-$Revision: 1.91 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@@ -173,7 +173,8 @@ file-system MSDOSFS # MS-DOS FAT filesystem(s).
## File system options.
#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options NFS_V2_ONLY # Exclude NFS3 code to save space
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index af09b862526..7bfd42dda66 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.33 2011/02/13 14:28:29 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.34 2011/03/06 17:08:33 bouyer Exp $
#
# GENERIC machine description file
#
@@ -69,7 +69,8 @@ file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
# File system options
-#options QUOTA # UFS quotas
+#options QUOTA # legacy UFS quotas
+#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independant support
#options NFSSERVER
options WAPBL # File system journaling support - Experimental