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>

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>
Jens Axboe
1 parent 3c18ce71af
Showing 3 changed files with 12 additions and 30 deletions Side-by-side Diff
block/Kconfig
fs/ext4/super.c
include/linux/types.h
@@ -24,22 +24,18 @@
 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.
+	
+	  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
@@ -57,15 +53,6 @@
 	  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.
-
-	  If unsure, say Y.
  
 config BLK_DEV_BSG
 	bool "Block layer SG support v4 (EXPERIMENTAL)"
@@ -1721,7 +1721,7 @@
 	/* small i_blocks in vfs inode? */
 	if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) {
 		/*
-		 * CONFIG_LSF is not enabled implies the inode
+		 * CONFIG_LBD is not enabled implies the inode
 		 * i_block represent total blocks in 512 bytes
 		 * 32 == size of vfs inode i_blocks * 8
 		 */
@@ -1764,7 +1764,7 @@
  
 	if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) {
 		/*
-		 * !has_huge_files or CONFIG_LSF is not enabled
+		 * !has_huge_files or CONFIG_LBD is not enabled
 		 * implies the inode i_block represent total blocks in
 		 * 512 bytes 32 == size of vfs inode i_blocks * 8
 		 */
  
@@ -2021,13 +2021,13 @@
 	if (has_huge_files) {
 		/*
 		 * Large file size enabled file system can only be
-		 * mount if kernel is build with CONFIG_LSF
+		 * mount if kernel is build with CONFIG_LBD
 		 */
 		if (sizeof(root->i_blocks) < sizeof(u64) &&
 				!(sb->s_flags & MS_RDONLY)) {
 			printk(KERN_ERR "EXT4-fs: %s: Filesystem with huge "
 					"files cannot be mounted read-write "
-					"without CONFIG_LSF.\n", sb->s_id);
+					"without CONFIG_LBD.\n", sb->s_id);
 			goto failed_mount;
 		}
 	}
@@ -135,19 +135,14 @@
  *
  * Linux always considers sectors to be 512 bytes long independently
  * of the devices real block size.
+ *
+ * blkcnt_t is the type of the inode's block count.
  */
 #ifdef CONFIG_LBD
 typedef u64 sector_t;
-#else
-typedef unsigned long sector_t;
-#endif
-
-/*
- * The type of the inode's block count.
- */
-#ifdef CONFIG_LSF
 typedef u64 blkcnt_t;
 #else
+typedef unsigned long sector_t;
 typedef unsigned long blkcnt_t;
 #endif
...	...	@@ -24,22 +24,18 @@
24	24	if BLOCK
25	25
26	26	config LBD
27		- bool "Support for Large Block Devices"
	27	+ bool "Support for large block devices and files"
28	28	depends on !64BIT
29	29	help
30		- Enable block devices of size 2TB and larger.
	30	+ Enable block devices or files of size 2TB and larger.
31	31
32	32	This option is required to support the full capacity of large
33	33	(2TB+) block devices, including RAID, disk, Network Block Device,
34	34	Logical Volume Manager (LVM) and loopback.
	35	+
	36	+ This option also enables support for single files larger than
	37	+ 2TB.
35	38
36		- For example, RAID devices are frequently bigger than the capacity
37		- of the largest individual hard drive.
38		-
39		- This option is not required if you have individual disk drives
40		- which total 2TB+ and you are not aggregating the capacity into
41		- a large block device (e.g. using RAID or LVM).
42		-
43	39	If unsure, say N.
44	40
45	41	config BLK_DEV_IO_TRACE
...	...	@@ -57,15 +53,6 @@
57	53	git://git.kernel.dk/blktrace.git
58	54
59	55	If unsure, say N.
60		-
61		-config LSF
62		- bool "Support for Large Single Files"
63		- depends on !64BIT
64		- help
65		- Say Y here if you want to be able to handle very large files (2TB
66		- and larger), otherwise say N.
67		-
68		- If unsure, say Y.
69	56
70	57	config BLK_DEV_BSG
71	58	bool "Block layer SG support v4 (EXPERIMENTAL)"
...	...	@@ -1721,7 +1721,7 @@
1721	1721	/* small i_blocks in vfs inode? */
1722	1722	if (!has_huge_files \|\| sizeof(blkcnt_t) < sizeof(u64)) {
1723	1723	/*
1724		- * CONFIG_LSF is not enabled implies the inode
	1724	+ * CONFIG_LBD is not enabled implies the inode
1725	1725	* i_block represent total blocks in 512 bytes
1726	1726	* 32 == size of vfs inode i_blocks * 8
1727	1727	*/
...	...	@@ -1764,7 +1764,7 @@
1764	1764
1765	1765	if (!has_huge_files \|\| sizeof(blkcnt_t) < sizeof(u64)) {
1766	1766	/*
1767		- * !has_huge_files or CONFIG_LSF is not enabled
	1767	+ * !has_huge_files or CONFIG_LBD is not enabled
1768	1768	* implies the inode i_block represent total blocks in
1769	1769	* 512 bytes 32 == size of vfs inode i_blocks * 8
1770	1770	*/
1771	1771
...	...	@@ -2021,13 +2021,13 @@
2021	2021	if (has_huge_files) {
2022	2022	/*
2023	2023	* Large file size enabled file system can only be
2024		- * mount if kernel is build with CONFIG_LSF
	2024	+ * mount if kernel is build with CONFIG_LBD
2025	2025	*/
2026	2026	if (sizeof(root->i_blocks) < sizeof(u64) &&
2027	2027	!(sb->s_flags & MS_RDONLY)) {
2028	2028	printk(KERN_ERR "EXT4-fs: %s: Filesystem with huge "
2029	2029	"files cannot be mounted read-write "
2030		- "without CONFIG_LSF.\n", sb->s_id);
	2030	+ "without CONFIG_LBD.\n", sb->s_id);
2031	2031	goto failed_mount;
2032	2032	}
2033	2033	}
...	...	@@ -135,19 +135,14 @@
135	135	*
136	136	* Linux always considers sectors to be 512 bytes long independently
137	137	* of the devices real block size.
	138	+ *
	139	+ * blkcnt_t is the type of the inode's block count.
138	140	*/
139	141	#ifdef CONFIG_LBD
140	142	typedef u64 sector_t;
141		-#else
142		-typedef unsigned long sector_t;
143		-#endif
144		-
145		-/*
146		- * The type of the inode's block count.
147		- */
148		-#ifdef CONFIG_LSF
149	143	typedef u64 blkcnt_t;
150	144	#else
	145	+typedef unsigned long sector_t;
151	146	typedef unsigned long blkcnt_t;
152	147	#endif
153	148