Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Tiezhu Yang <yangtiezhu@loongson.cn>
To:     Jens Axboe <axboe@kernel.dk>, Jonathan Corbet <corbet@lwn.net>
Cc:     linux-block@vger.kernel.org, linux-doc@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] block: print correct sectors in printk_all_partitions()
Date:   Sat,  9 Apr 2022 11:39:41 +0800
Message-Id: <1649475581-12139-4-git-send-email-yangtiezhu@loongson.cn>
In-Reply-To: <1649475581-12139-1-git-send-email-yangtiezhu@loongson.cn>
References: <1649475581-12139-1-git-send-email-yangtiezhu@loongson.cn>
Precedence: bulk

If there is no valid initrd, but root=UUID or root=LABEL is used
in the command line, boot hangs like this:

[    5.739815] VFS: Cannot open root device "UUID=19957230-2e15-494c-8dfa-84aab3591961" or unknown-block(0,0): error -6
[    5.750280] Please append a correct "root=" boot option; here are the available partitions:
[    5.856059] 0800       125034840 sda
[    5.856061]  driver: sd
[    5.862124]   0801          307200 sda1 d5077411-3d87-4f85-b312-8cc309ef9073
[    5.862128]
[    5.870603]   0802         1048576 sda2 aae0dd30-e5f5-44e1-994e-d47bf5ce2e52
[    5.870606]
[    5.879080]   0803        52428800 sda3 759079ee-85fa-4636-9de7-1ac0643ab87e
[    5.879083]
[    5.887558]   0804         8388608 sda4 439c4b0a-7b4f-4434-82f1-f9d380b55fb9
[    5.887560]
[    5.896035]   0805        62860288 sda5 ee52e951-1315-4fab-a3e5-45c6eeae6ce6
[    5.910575] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)
[    5.918796] ---[ end Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) ]---

In the above log, the sectors are not consistent with the output
of fdisk command, fix it.

[root@linux loongson]# fdisk -l /dev/sda

Disk /dev/sda: 119.2 GiB, 128035676160 bytes, 250069680 sectors
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: gpt
Disk identifier: 01D1BA1C-232F-45CA-AC12-0AF2A5D8CE0D

Device         Start       End   Sectors  Size Type
/dev/sda1       2048    616447    614400  300M EFI System
/dev/sda2     616448   2713599   2097152    1G Linux filesystem
/dev/sda3    2713600 107571199 104857600   50G Linux filesystem
/dev/sda4  107571200 124348415  16777216    8G Linux swap
/dev/sda5  124348416 250068991 125720576   60G Linux filesystem

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
 block/genhd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/genhd.c b/block/genhd.c
index b8b6759..453ce42 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -761,7 +761,7 @@ void __init printk_all_partitions(void)
 			printk("%s%s %10llu %pg %s",
 			       bdev_is_partition(part) ? "  " : "",
 			       bdevt_str(part->bd_dev, devt_buf),
-			       bdev_nr_sectors(part) >> 1, part,
+			       bdev_nr_sectors(part), part,
 			       part->bd_meta_info ?
 					part->bd_meta_info->uuid : "");
 			if (bdev_is_partition(part))
-- 
2.1.0