tunnels: fix netns vs proto registration ordering

[safe/jmp/linux-2.6] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index ac0956f..e20fbde 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -23,9 +23,10 @@ menuconfig BLOCK
 
 if BLOCK
 
-config LBD
-       bool "Support for large block devices and files"
+config LBDAF
+       bool "Support for large (2TB+) block devices and files"
        depends on !64BIT
+       default y
        help
          Enable block devices or files of size 2TB and larger.
 
@@ -36,28 +37,20 @@ config LBD
          This option also enables support for single files larger than
          2TB.
 
-         If unsure, say N.
-
-config BLK_DEV_IO_TRACE
-       bool "Support for tracing block io actions"
-       depends on SYSFS
-       select RELAY
-       select DEBUG_FS
-       select TRACEPOINTS
-       help
-         Say Y here if you want to be able to trace the block layer actions
-         on a given queue. Tracing allows you to see any traffic happening
-         on a block device queue. For more information (and the userspace
-         support tools needed), fetch the blktrace tools from:
+         The ext4 filesystem requires that this feature be enabled in
+         order to support filesystems that have the huge_file feature
+         enabled.  Otherwise, it will refuse to mount in the read-write
+         mode any filesystems that use the huge_file feature, which is
+         enabled by default by mke2fs.ext4.
 
-         git://git.kernel.dk/blktrace.git
+         The GFS2 filesystem also requires this feature.
 
-         If unsure, say N.
+         If unsure, say Y.
 
 config BLK_DEV_BSG
-       bool "Block layer SG support v4 (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       ---help---
+       bool "Block layer SG support v4"
+       default y
+       help
          Saying Y here will enable generic SG (SCSI generic) v4 support
          for any block device.
 
@@ -67,7 +60,10 @@ config BLK_DEV_BSG
          protocols (e.g. Task Management Functions and SMP in Serial
          Attached SCSI).
 
-         If unsure, say N.
+         This option is required by recent UDEV versions to properly
+         access device serial numbers, etc.
+
+         If unsure, say Y.
 
 config BLK_DEV_INTEGRITY
        bool "Block layer data integrity support"
@@ -81,6 +77,28 @@ config BLK_DEV_INTEGRITY
        T10/SCSI Data Integrity Field or the T13/ATA External Path
        Protection.  If in doubt, say N.
 
+config BLK_CGROUP
+       bool
+       depends on CGROUPS
+       default n
+       ---help---
+       Generic block IO controller cgroup interface. This is the common
+       cgroup interface which should be used by various IO controlling
+       policies.
+
+       Currently, CFQ IO scheduler uses it to recognize task groups and
+       control disk bandwidth allocation (proportional time slice allocation)
+       to such task groups.
+
+config DEBUG_BLK_CGROUP
+       bool
+       depends on BLK_CGROUP
+       default n
+       ---help---
+       Enable some debugging help. Currently it stores the cgroup path
+       in the blk group which can be used by cfq for tracing various
+       group related activity.
+
 endif # BLOCK
 
 config BLOCK_COMPAT