Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Paul Gortmaker and committed by
Linus Torvalds
080506ad eadb41ae

+24 -13
+2
Documentation/block/00-INDEX
··· 6 6 - Generic Block Device Capability (/sys/block/<device>/capability) 7 7 cfq-iosched.txt 8 8 - CFQ IO scheduler tunables 9 + cmdline-partition.txt 10 + - how to specify block device partitions on kernel command line 9 11 data-integrity.txt 10 12 - Block data integrity 11 13 deadline-iosched.txt
+4 -4
Documentation/block/cmdline-partition.txt
··· 1 - Embedded device command line partition 1 + Embedded device command line partition parsing 2 2 ===================================================================== 3 3 4 - Read block device partition table from command line. 5 - The partition used for fixed block device (eMMC) embedded device. 6 - It is no MBR, save storage space. Bootloader can be easily accessed 4 + Support for reading the block device partition table from the command line. 5 + It is typically used for fixed block (eMMC) embedded devices. 6 + It has no MBR, so saves storage space. Bootloader can be easily accessed 7 7 by absolute address of data on the block device. 8 8 Users can easily change the partition. 9 9
+4
Documentation/kernel-parameters.txt
··· 480 480 Format: <io>,<irq>,<mode> 481 481 See header of drivers/net/hamradio/baycom_ser_hdx.c. 482 482 483 + blkdevparts= Manual partition parsing of block device(s) for 484 + embedded devices based on command line input. 485 + See Documentation/block/cmdline-partition.txt 486 + 483 487 boot_delay= Milliseconds to delay each printk during boot. 484 488 Values larger than 10 seconds (10000) are changed to 485 489 no delay (0).
+7 -2
block/Kconfig
··· 99 99 100 100 See Documentation/cgroups/blkio-controller.txt for more information. 101 101 102 - config CMDLINE_PARSER 102 + config BLK_CMDLINE_PARSER 103 103 bool "Block device command line partition parser" 104 104 default n 105 105 ---help--- 106 - Parsing command line, get the partitions information. 106 + Enabling this option allows you to specify the partition layout from 107 + the kernel boot args. This is typically of use for embedded devices 108 + which don't otherwise have any standardized method for listing the 109 + partitions on a block device. 110 + 111 + See Documentation/block/cmdline-partition.txt for more information. 107 112 108 113 menu "Partition Types" 109 114
+1 -1
block/Makefile
··· 18 18 19 19 obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o 20 20 obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o 21 - obj-$(CONFIG_CMDLINE_PARSER) += cmdline-parser.o 21 + obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
+2 -2
block/partitions/Kconfig
··· 263 263 264 264 config CMDLINE_PARTITION 265 265 bool "Command line partition support" if PARTITION_ADVANCED 266 - select CMDLINE_PARSER 266 + select BLK_CMDLINE_PARSER 267 267 help 268 - Say Y here if you would read the partitions table from bootargs. 268 + Say Y here if you want to read the partition table from bootargs. 269 269 The format for the command line is just like mtdparts.
+4 -4
block/partitions/cmdline.c
··· 2 2 * Copyright (C) 2013 HUAWEI 3 3 * Author: Cai Zhiyong <caizhiyong@huawei.com> 4 4 * 5 - * Read block device partition table from command line. 6 - * The partition used for fixed block device (eMMC) embedded device. 7 - * It is no MBR, save storage space. Bootloader can be easily accessed 5 + * Read block device partition table from the command line. 6 + * Typically used for fixed block (eMMC) embedded devices. 7 + * It has no MBR, so saves storage space. Bootloader can be easily accessed 8 8 * by absolute address of data on the block device. 9 9 * Users can easily change the partition. 10 10 * 11 11 * The format for the command line is just like mtdparts. 12 12 * 13 - * Verbose config please reference "Documentation/block/cmdline-partition.txt" 13 + * For further information, see "Documentation/block/cmdline-partition.txt" 14 14 * 15 15 */ 16 16