[PATCH] init, Documentation: Remove ramdisk_blocksize mentions

[PATCH] init, Documentation: Remove ramdisk_blocksize mentions

[Robert Elliott]

The brd driver has never supported the ramdisk_blocksize kernel
parameter that was in the rd driver it replaced, so remove
mention of this parameter from comments and Documentation.

Commit 9db5579be4bb ("rewrite rd") replaced rd with brd, keeping
a brd_blocksize variable in struct brd_device but never using it.

Commit a2cba2913c76 ("brd: get rid of unused members from struct
brd_device") removed the unused variable.

Commit f5abc8e75815 ("Documentation/blockdev/ramdisk.txt: updates")
removed mentions of ramdisk_blocksize from that file.

Signed-off-by: Robert Elliott <elliott@hpe.com>
---
 Documentation/kernel-parameters.txt | 3 ---
 init/do_mounts_rd.c                 | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 742f69d..461686e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3050,9 +3050,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 	raid=		[HW,RAID]
 			See Documentation/md.txt.
 
-	ramdisk_blocksize=	[RAM]
-			See Documentation/blockdev/ramdisk.txt.
-
 	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes
 			See Documentation/blockdev/ramdisk.txt.
 
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index e5d059e..8a09b32 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -216,13 +216,6 @@ int __init rd_load_image(char *from)
 	/*
 	 * NOTE NOTE: nblocks is not actually blocks but
 	 * the number of kibibytes of data to load into a ramdisk.
-	 * So any ramdisk block size that is a multiple of 1KiB should
-	 * work when the appropriate ramdisk_blocksize is specified
-	 * on the command line.
-	 *
-	 * The default ramdisk_blocksize is 1KiB and it is generally
-	 * silly to use anything else, so make sure to use 1KiB
-	 * blocksize while generating ext2fs ramdisk-images.
 	 */
 	if (sys_ioctl(out_fd, BLKGETSIZE, (unsigned long)&rd_blocks) < 0)
 		rd_blocks = 0;
-- 
2.4.3

Re: [PATCH] init, Documentation: Remove ramdisk_blocksize mentions

[Jonathan Corbet]

On Wed, 23 Dec 2015 18:28:49 -0600
Robert Elliott <elliott@hpe.com> wrote:

> The brd driver has never supported the ramdisk_blocksize kernel
> parameter that was in the rd driver it replaced, so remove
> mention of this parameter from comments and Documentation.
> 
> Commit 9db5579be4bb ("rewrite rd") replaced rd with brd, keeping
> a brd_blocksize variable in struct brd_device but never using it.
> 
> Commit a2cba2913c76 ("brd: get rid of unused members from struct
> brd_device") removed the unused variable.

init/do_mounts_rd.c is a bit outside of the normal docs maintainer beat,
but there doesn't seem to be anybody else who should take this either, so
I've applied it to the docs tree.

Thanks,

jon