Get rid of CONFIG_LSF

We have two seperate config entries for large devices/files. One
is CONFIG_LBD that guards just the devices, the other is CONFIG_LSF
that handles large files. This doesn't make a lot of sense, you typically
want both or none. So get rid of CONFIG_LSF and change CONFIG_LBD wording
to indicate that it covers both.

Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 5 insertions, 18 deletions

diff --git a/block/Kconfig b/block/Kconfig
index 290b219fad9c..ac0956f77785 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -24,21 +24,17 @@ menuconfig BLOCK
 if BLOCK
 
 config LBD
-        bool "Support for Large Block Devices"
+        bool "Support for large block devices and files"
         depends on !64BIT
         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.
-
-          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).
+        
+          This option also enables support for single files larger than
+          2TB.
 
           If unsure, say N.
 
@@ -58,15 +54,6 @@ config BLK_DEV_IO_TRACE
 
           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.
-
-          If unsure, say Y.
-
 config BLK_DEV_BSG
         bool "Block layer SG support v4 (EXPERIMENTAL)"
         depends on EXPERIMENTAL