| From 9e3cd6803315cb8c88e7570f187bf46ee0447e3c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 23 Feb 2021 16:50:15 +0800 |
| Subject: block: fix logging on capacity change |
| |
| From: Ming Lei <ming.lei@redhat.com> |
| |
| [ Upstream commit 452c0bf8754fbeffdf579465b82a3c2bbe373c95 ] |
| |
| Local variable of 'capacity' stores the previous disk capacity, and |
| 'size' variable records the latest disk capacity, so swap them for |
| fixing logging on capacity change. |
| |
| Cc: Christoph Hellwig <hch@lst.de> |
| Fixes: a782483cc1f8 ("block: remove the nr_sects field in struct hd_struct") |
| Signed-off-by: Ming Lei <ming.lei@redhat.com> |
| Reviewed-by: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| block/genhd.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/block/genhd.c b/block/genhd.c |
| index 9e741a4f351be..07a0ef741de19 100644 |
| --- a/block/genhd.c |
| +++ b/block/genhd.c |
| @@ -74,7 +74,7 @@ bool set_capacity_and_notify(struct gendisk *disk, sector_t size) |
| return false; |
| |
| pr_info("%s: detected capacity change from %lld to %lld\n", |
| - disk->disk_name, size, capacity); |
| + disk->disk_name, capacity, size); |
| |
| /* |
| * Historically we did not send a uevent for changes to/from an empty |
| -- |
| 2.27.0 |
| |
