Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sat, 4 Apr 2020 19:57:59 +0800
From:   Bo YU <tsu.yubo@gmail.com>
To:     axboe@kernel.dk
Cc:     linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
        yuzibode@126.com, tsu.yubo@gmail.com
Subject: [PATCH -next] block/genhd: Align the label with the content of the
 /proc/partitions
Message-ID: <20200404115759.yo4u52vdzsvox6wc@kaowomen.cn>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Disposition: inline
User-Agent: NeoMutt/20171215
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Before the patch,cat /proc/partitions:

major minor  #blocks  name

 254        0   57671680 vda
 254        1   57670656 vda1

After the patch:

major minor   #blocks    name

254   0       57671680   vda
254   1       57670656   vda1

According to LDD3,major device maximun number is 12 bit,as it has 4 char
placeholders.minor device maximum number is 20 bit(7 char palceholders)
and keeping 10 char palceholders for blocks tag.If want to keep
palceholder's numbers dynamiclly, There is more tricks to do that.  So i
keep it simple.

Signed-off-by: Bo YU <tsu.yubo@gmail.com>
---
 block/genhd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 06b642b23a07..63a483cf76b9 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1151,7 +1151,7 @@ static void *show_partition_start(struct seq_file *seqf, loff_t *pos)

 	p = disk_seqf_start(seqf, pos);
 	if (!IS_ERR_OR_NULL(p) && !*pos)
-		seq_puts(seqf, "major minor  #blocks  name\n\n");
+		seq_puts(seqf, "major minor   #blocks    name\n\n");
 	return p;
 }

@@ -1172,7 +1172,7 @@ static int show_partition(struct seq_file *seqf, void *v)
 	/* show the full disk and all non-0 size partitions of it */
 	disk_part_iter_init(&piter, sgp, DISK_PITER_INCL_PART0);
 	while ((part = disk_part_iter_next(&piter)))
-		seq_printf(seqf, "%4d  %7d %10llu %s\n",
+		seq_printf(seqf, "%-4d  %-7d %-10llu %s\n",
 			   MAJOR(part_devt(part)), MINOR(part_devt(part)),
 			   (unsigned long long)part_nr_sects_read(part) >> 1,
 			   disk_name(sgp, part->partno, buf));
--
2.11.0