瀏覽代碼

block: change config option name for cmdline partition parsing

Recently commit bab55417b10c ("block: support embedded device command
line partition") introduced CONFIG_CMDLINE_PARSER.  However, that name
is too generic and sounds like it enables/disables generic kernel boot
arg processing, when it really is block specific.

Before this option becomes a part of a full/final release, add the BLK_
prefix to it so that it is clear in absence of any other context that it
is block specific.

In addition, fix up the following less critical items:
 - help text was not really at all helpful.
 - index file for Documentation was not updated
 - add the new arg to Documentation/kernel-parameters.txt
 - clarify wording in source comments

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Cai Zhiyong <caizhiyong@huawei.com>
Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Paul Gortmaker 12 年之前
父節點
當前提交
080506ad0a

+ 2 - 0
Documentation/block/00-INDEX

@@ -6,6 +6,8 @@ capability.txt
 	- Generic Block Device Capability (/sys/block/<device>/capability)
 	- Generic Block Device Capability (/sys/block/<device>/capability)
 cfq-iosched.txt
 cfq-iosched.txt
 	- CFQ IO scheduler tunables
 	- CFQ IO scheduler tunables
+cmdline-partition.txt
+	- how to specify block device partitions on kernel command line
 data-integrity.txt
 data-integrity.txt
 	- Block data integrity
 	- Block data integrity
 deadline-iosched.txt
 deadline-iosched.txt

+ 4 - 4
Documentation/block/cmdline-partition.txt

@@ -1,9 +1,9 @@
-Embedded device command line partition
+Embedded device command line partition parsing
 =====================================================================
 =====================================================================
 
 
-Read block device partition table from command line.
-The partition used for fixed block device (eMMC) embedded device.
-It is no MBR, save storage space. Bootloader can be easily accessed
+Support for reading the block device partition table from the command line.
+It is typically used for fixed block (eMMC) embedded devices.
+It has no MBR, so saves storage space. Bootloader can be easily accessed
 by absolute address of data on the block device.
 by absolute address of data on the block device.
 Users can easily change the partition.
 Users can easily change the partition.
 
 

+ 4 - 0
Documentation/kernel-parameters.txt

@@ -480,6 +480,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			Format: <io>,<irq>,<mode>
 			Format: <io>,<irq>,<mode>
 			See header of drivers/net/hamradio/baycom_ser_hdx.c.
 			See header of drivers/net/hamradio/baycom_ser_hdx.c.
 
 
+	blkdevparts=	Manual partition parsing of block device(s) for
+			embedded devices based on command line input.
+			See Documentation/block/cmdline-partition.txt
+
 	boot_delay=	Milliseconds to delay each printk during boot.
 	boot_delay=	Milliseconds to delay each printk during boot.
 			Values larger than 10 seconds (10000) are changed to
 			Values larger than 10 seconds (10000) are changed to
 			no delay (0).
 			no delay (0).

+ 7 - 2
block/Kconfig

@@ -99,11 +99,16 @@ config BLK_DEV_THROTTLING
 
 
 	See Documentation/cgroups/blkio-controller.txt for more information.
 	See Documentation/cgroups/blkio-controller.txt for more information.
 
 
-config CMDLINE_PARSER
+config BLK_CMDLINE_PARSER
 	bool "Block device command line partition parser"
 	bool "Block device command line partition parser"
 	default n
 	default n
 	---help---
 	---help---
-	Parsing command line, get the partitions information.
+	Enabling this option allows you to specify the partition layout from
+	the kernel boot args.  This is typically of use for embedded devices
+	which don't otherwise have any standardized method for listing the
+	partitions on a block device.
+
+	See Documentation/block/cmdline-partition.txt for more information.
 
 
 menu "Partition Types"
 menu "Partition Types"
 
 

+ 1 - 1
block/Makefile

@@ -18,4 +18,4 @@ obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
 
 
 obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
 obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
 obj-$(CONFIG_BLK_DEV_INTEGRITY)	+= blk-integrity.o
 obj-$(CONFIG_BLK_DEV_INTEGRITY)	+= blk-integrity.o
-obj-$(CONFIG_CMDLINE_PARSER)	+= cmdline-parser.o
+obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o

+ 2 - 2
block/partitions/Kconfig

@@ -263,7 +263,7 @@ config SYSV68_PARTITION
 
 
 config CMDLINE_PARTITION
 config CMDLINE_PARTITION
 	bool "Command line partition support" if PARTITION_ADVANCED
 	bool "Command line partition support" if PARTITION_ADVANCED
-	select CMDLINE_PARSER
+	select BLK_CMDLINE_PARSER
 	help
 	help
-	  Say Y here if you would read the partitions table from bootargs.
+	  Say Y here if you want to read the partition table from bootargs.
 	  The format for the command line is just like mtdparts.
 	  The format for the command line is just like mtdparts.

+ 4 - 4
block/partitions/cmdline.c

@@ -2,15 +2,15 @@
  * Copyright (C) 2013 HUAWEI
  * Copyright (C) 2013 HUAWEI
  * Author: Cai Zhiyong <caizhiyong@huawei.com>
  * Author: Cai Zhiyong <caizhiyong@huawei.com>
  *
  *
- * Read block device partition table from command line.
- * The partition used for fixed block device (eMMC) embedded device.
- * It is no MBR, save storage space. Bootloader can be easily accessed
+ * Read block device partition table from the command line.
+ * Typically used for fixed block (eMMC) embedded devices.
+ * It has no MBR, so saves storage space. Bootloader can be easily accessed
  * by absolute address of data on the block device.
  * by absolute address of data on the block device.
  * Users can easily change the partition.
  * Users can easily change the partition.
  *
  *
  * The format for the command line is just like mtdparts.
  * The format for the command line is just like mtdparts.
  *
  *
- * Verbose config please reference "Documentation/block/cmdline-partition.txt"
+ * For further information, see "Documentation/block/cmdline-partition.txt"
  *
  *
  */
  */