UBUNTU: Ubuntu-2.6.38-12.51

[linux-flexiantxendom0-natty.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 290b219..60be1e0 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -2,7 +2,7 @@
 # Block layer core configuration
 #
 menuconfig BLOCK
-       bool "Enable the block layer" if EMBEDDED
+       bool "Enable the block layer" if EXPERT
        default y
        help
         Provide block layer support for the kernel.
@@ -23,54 +23,34 @@ menuconfig BLOCK
 
 if BLOCK
 
-config LBD
-       bool "Support for Large Block Devices"
+config LBDAF
+       bool "Support for large (2TB+) block devices and files"
        depends on !64BIT
+       default y
        help
-         Enable block devices of size 2TB and larger.
+         Enable block devices or files of size 2TB and larger.
 
          This option is required to support the full capacity of large
          (2TB+) block devices, including RAID, disk, Network Block Device,
          Logical Volume Manager (LVM) and loopback.
+       
+         This option also enables support for single files larger than
+         2TB.
 
-         For example, RAID devices are frequently bigger than the capacity
-         of the largest individual hard drive.
-
-         This option is not required if you have individual disk drives
-         which total 2TB+ and you are not aggregating the capacity into
-         a large block device (e.g. using RAID or LVM).
-
-         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
-
-         If unsure, say N.
-
-config LSF
-       bool "Support for Large Single Files"
-       depends on !64BIT
-       help
-         Say Y here if you want to be able to handle very large files (2TB
-         and larger), otherwise say N.
+         The GFS2 filesystem also requires this feature.
 
          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.
 
@@ -80,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"
@@ -94,6 +77,18 @@ config BLK_DEV_INTEGRITY
        T10/SCSI Data Integrity Field or the T13/ATA External Path
        Protection.  If in doubt, say N.
 
+config BLK_DEV_THROTTLING
+       bool "Block layer bio throttling support"
+       depends on BLK_CGROUP=y && EXPERIMENTAL
+       default n
+       ---help---
+       Block layer bio throttling support. It can be used to limit
+       the IO rate to a device. IO rate policies are per cgroup and
+       one needs to mount and use blkio cgroup controller for creating
+       cgroups and specifying per device IO rate policies.
+
+       See Documentation/cgroups/blkio-controller.txt for more information.
+
 endif # BLOCK
 
 config BLOCK_COMPAT