Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965848AbbLWX12 (ORCPT ); Wed, 23 Dec 2015 18:27:28 -0500 Received: from g2t1383g.austin.hp.com ([15.217.136.92]:59675 "EHLO g2t1383g.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965740AbbLWX10 (ORCPT ); Wed, 23 Dec 2015 18:27:26 -0500 From: Robert Elliott To: corbet@lwn.net, axboe@kernel.dk, fabf@skynet.be Cc: rdunlap@infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Elliott Subject: [PATCH] init, Documentation: Remove ramdisk_blocksize mentions Date: Wed, 23 Dec 2015 18:28:49 -0600 Message-Id: <1450916929-3899-1-git-send-email-elliott@hpe.com> X-Mailer: git-send-email 2.4.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2239 Lines: 59 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/