[20/78] md: use set_capacity_and_notify

Message ID	20201116145809.410558-21-hch@lst.de
State	New
Headers	show Return-Path: <ceph-devel-owner@kernel.org> From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: Justin Sanders <justin@coraid.com>, Josef Bacik <josef@toxicpanda.com>, Ilya Dryomov <idryomov@gmail.com>, Jack Wang <jinpu.wang@cloud.ionos.com>, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, =?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>, Minchan Kim <minchan@kernel.org>, Mike Snitzer <snitzer@redhat.com>, Song Liu <song@kernel.org>, "Martin K. Petersen" <martin.petersen@oracle.com>, dm-devel@redhat.com, linux-block@vger.kernel.org, drbd-dev@lists.linbit.com, nbd@other.debian.org, ceph-devel@vger.kernel.org, xen-devel@lists.xenproject.org, linux-raid@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 20/78] md: use set_capacity_and_notify Date: Mon, 16 Nov 2020 15:57:11 +0100 Message-Id: <20201116145809.410558-21-hch@lst.de> In-Reply-To: <20201116145809.410558-1-hch@lst.de> References: <20201116145809.410558-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/78] block: remove the call to __invalidate_device in check_disk_size_change \| expand [01/78] block: remove the call to __invalidate_device in check_disk_size_change [02/78] loop: let set_capacity_revalidate_and_notify update the bdev size [03/78] nvme: let set_capacity_revalidate_and_notify update the bdev size [04/78] sd: update the bdev size in sd_revalidate_disk [05/78] block: remove the update_bdev parameter to set_capacity_revalidate_and_notify [06/78] nbd: remove the call to set_blocksize [07/78] nbd: move the task_recv check into nbd_size_update [08/78] nbd: refactor size updates [09/78] nbd: validate the block size in nbd_set_size [10/78] nbd: use set_capacity_and_notify [11/78] aoe: don't call set_capacity from irq context [12/78] dm: use set_capacity_and_notify [13/78] pktcdvd: use set_capacity_and_notify [14/78] nvme: use set_capacity_and_notify in nvme_set_queue_dying [15/78] drbd: use set_capacity_and_notify [16/78] rbd: use set_capacity_and_notify [17/78] rnbd: use set_capacity_and_notify [18/78] zram: use set_capacity_and_notify [19/78] dm-raid: use set_capacity_and_notify [20/78] md: use set_capacity_and_notify [21/78] md: remove a spurious call to revalidate_disk_size in update_size [22/78] virtio-blk: remove a spurious call to revalidate_disk_size [23/78] block: unexport revalidate_disk_size [24/78] mtd_blkdevs: don't override BLKFLSBUF [25/78] block: don't call into the driver for BLKFLSBUF [26/78] block: add a new set_read_only method [27/78] rbd: implement ->set_read_only to hook into BLKROSET processing [28/78] md: implement ->set_read_only to hook into BLKROSET processing [29/78] dasd: implement ->set_read_only to hook into BLKROSET processing [30/78] block: don't call into the driver for BLKROSET [31/78] loop: use set_disk_ro [32/78] block: remove set_device_ro [33/78] block: remove __blkdev_driver_ioctl [34/78] block: propagate BLKROSET to all partitions [35/78] block: cleanup del_gendisk a bit [36/78] block: open code kobj_map into in block/genhd.c [37/78] block: split block_class_lock [38/78] block: rework requesting modules for unclaimed devices [39/78] block: add an optional probe callback to major_names [40/78] ide: remove ide_{,un}register_region [41/78] swim: don't call blk_register_region [42/78] sd: use __register_blkdev to avoid a modprobe for an unregistered dev_t [43/78] brd: use __register_blkdev to allocate devices on demand [44/78] loop: use __register_blkdev to allocate devices on demand [45/78] md: use __register_blkdev to allocate devices on demand [46/78] ide: switch to __register_blkdev for command set probing [47/78] floppy: use a separate gendisk for each media format [48/78] amiflop: use separate gendisks for Amiga vs MS-DOS mode [49/78] ataflop: use a separate gendisk for each media format [50/78] z2ram: reindent [51/78] z2ram: use separate gendisk for the different modes [52/78] block: switch gendisk lookup to a simple xarray [53/78] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats [54/78] block: remove a duplicate __disk_get_part prototype [55/78] block: change the hash used for looking up block devices [56/78] init: refactor name_to_dev_t [57/78] init: refactor devt_from_partuuid [58/78] init: cleanup match_dev_by_uuid and match_dev_by_label [59/78] mtip32xx: remove the call to fsync_bdev on removal [60/78] zram: remove the claim mechanism [61/78] zram: do not call set_blocksize [62/78] loop: do not call set_blocksize [63/78] bcache: remove a superflous lookup_bdev all [64/78] dm: simplify flush_bio initialization in __send_empty_flush [65/78] dm: remove the block_device reference in struct mapped_device [66/78] block: keep a block_device reference for each hd_struct [67/78] block: simplify the block device claiming interface [68/78] block: remove ->bd_contains [69/78] block: remove the nr_sects field in struct hd_struct [70/78] block: replace bd_mutex with a per-gendisk mutex [71/78] block: add a bdev_kobj helper [72/78] block: use disk_part_iter_exit in disk_part_iter_next [73/78] block: use put_device in put_disk [74/78] block: merge struct block_device and struct hd_struct [75/78] block: stop using bdget_disk for partition 0 [76/78] filemap: use ->f_mapping over ->i_mapping consistently [77/78] fs: simplify the get_super_thawed interface [78/78] block: remove i_bdev

Message ID

20201116145809.410558-21-hch@lst.de

State

New

Headers

From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Justin Sanders <justin@coraid.com>, Josef Bacik <josef@toxicpanda.com>,
	Ilya Dryomov <idryomov@gmail.com>,
	Jack Wang <jinpu.wang@cloud.ionos.com>, "Michael S. Tsirkin"
	<mst@redhat.com>,         Jason Wang <jasowang@redhat.com>, Paolo Bonzini
	<pbonzini@redhat.com>,         Stefan Hajnoczi <stefanha@redhat.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, 
	=?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>,
	Minchan Kim <minchan@kernel.org>, Mike Snitzer
	<snitzer@redhat.com>, Song Liu <song@kernel.org>, "Martin K. Petersen"
	<martin.petersen@oracle.com>, dm-devel@redhat.com,
	linux-block@vger.kernel.org, drbd-dev@lists.linbit.com,
	nbd@other.debian.org, ceph-devel@vger.kernel.org,
	xen-devel@lists.xenproject.org, linux-raid@vger.kernel.org,
	linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org,
	linux-fsdevel@vger.kernel.org
Subject: [PATCH 20/78] md: use set_capacity_and_notify
Date: Mon, 16 Nov 2020 15:57:11 +0100
Message-Id: <20201116145809.410558-21-hch@lst.de>
In-Reply-To: <20201116145809.410558-1-hch@lst.de>
References: <20201116145809.410558-1-hch@lst.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[01/78] block: remove the call to __invalidate_device in check_disk_size_change | expand

Commit Message

Christoph Hellwig Nov. 16, 2020, 2:57 p.m. UTC

Use set_capacity_and_notify to set the size of both the disk and block
device.  This also gets the uevent notifications for the resize for free.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Song Liu <song@kernel.org>
---
 drivers/md/md-cluster.c |  6 ++----
 drivers/md/md-linear.c  |  3 +--
 drivers/md/md.c         | 24 ++++++++++--------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index 4aaf4820b6f625..87442dc59f6ca3 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -581,8 +581,7 @@  static int process_recvd_msg(struct mddev *mddev, struct cluster_msg *msg)
 		process_metadata_update(mddev, msg);
 		break;
 	case CHANGE_CAPACITY:
-		set_capacity(mddev->gendisk, mddev->array_sectors);
-		revalidate_disk_size(mddev->gendisk, true);
+		set_capacity_and_notify(mddev->gendisk, mddev->array_sectors);
 		break;
 	case RESYNCING:
 		set_bit(MD_RESYNCING_REMOTE, &mddev->recovery);
@@ -1296,8 +1295,7 @@  static void update_size(struct mddev *mddev, sector_t old_dev_sectors)
 		if (ret)
 			pr_err("%s:%d: failed to send CHANGE_CAPACITY msg\n",
 			       __func__, __LINE__);
-		set_capacity(mddev->gendisk, mddev->array_sectors);
-		revalidate_disk_size(mddev->gendisk, true);
+		set_capacity_and_notify(mddev->gendisk, mddev->array_sectors);
 	} else {
 		/* revert to previous sectors */
 		ret = mddev->pers->resize(mddev, old_dev_sectors);
diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c
index 5ab22069b5be9c..98f1b4b2bdcef8 100644
--- a/drivers/md/md-linear.c
+++ b/drivers/md/md-linear.c
@@ -200,9 +200,8 @@  static int linear_add(struct mddev *mddev, struct md_rdev *rdev)
 		"copied raid_disks doesn't match mddev->raid_disks");
 	rcu_assign_pointer(mddev->private, newconf);
 	md_set_array_sectors(mddev, linear_size(mddev, 0, 0));
-	set_capacity(mddev->gendisk, mddev->array_sectors);
+	set_capacity_and_notify(mddev->gendisk, mddev->array_sectors);
 	mddev_resume(mddev);
-	revalidate_disk_size(mddev->gendisk, true);
 	kfree_rcu(oldconf, rcu);
 	return 0;
 }
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 98bac4f304ae26..32e375d50fee17 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5355,10 +5355,9 @@  array_size_store(struct mddev *mddev, const char *buf, size_t len)
 
 	if (!err) {
 		mddev->array_sectors = sectors;
-		if (mddev->pers) {
-			set_capacity(mddev->gendisk, mddev->array_sectors);
-			revalidate_disk_size(mddev->gendisk, true);
-		}
+		if (mddev->pers)
+			set_capacity_and_notify(mddev->gendisk,
+						mddev->array_sectors);
 	}
 	mddev_unlock(mddev);
 	return err ?: len;
@@ -6107,8 +6106,7 @@  int do_md_run(struct mddev *mddev)
 	md_wakeup_thread(mddev->thread);
 	md_wakeup_thread(mddev->sync_thread); /* possibly kick off a reshape */
 
-	set_capacity(mddev->gendisk, mddev->array_sectors);
-	revalidate_disk_size(mddev->gendisk, true);
+	set_capacity_and_notify(mddev->gendisk, mddev->array_sectors);
 	clear_bit(MD_NOT_READY, &mddev->flags);
 	mddev->changed = 1;
 	kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE);
@@ -6423,10 +6421,9 @@  static int do_md_stop(struct mddev *mddev, int mode,
 			if (rdev->raid_disk >= 0)
 				sysfs_unlink_rdev(mddev, rdev);
 
-		set_capacity(disk, 0);
+		set_capacity_and_notify(disk, 0);
 		mutex_unlock(&mddev->open_mutex);
 		mddev->changed = 1;
-		revalidate_disk_size(disk, true);
 
 		if (mddev->ro)
 			mddev->ro = 0;
@@ -7257,8 +7254,8 @@  static int update_size(struct mddev *mddev, sector_t num_sectors)
 		if (mddev_is_clustered(mddev))
 			md_cluster_ops->update_size(mddev, old_dev_sectors);
 		else if (mddev->queue) {
-			set_capacity(mddev->gendisk, mddev->array_sectors);
-			revalidate_disk_size(mddev->gendisk, true);
+			set_capacity_and_notify(mddev->gendisk,
+						mddev->array_sectors);
 		}
 	}
 	return rv;
@@ -9035,10 +9032,9 @@  void md_do_sync(struct md_thread *thread)
 		mddev_lock_nointr(mddev);
 		md_set_array_sectors(mddev, mddev->pers->size(mddev, 0, 0));
 		mddev_unlock(mddev);
-		if (!mddev_is_clustered(mddev)) {
-			set_capacity(mddev->gendisk, mddev->array_sectors);
-			revalidate_disk_size(mddev->gendisk, true);
-		}
+		if (!mddev_is_clustered(mddev))
+			set_capacity_and_notify(mddev->gendisk,
+						mddev->array_sectors);
 	}
 
 	spin_lock(&mddev->lock);

[20/78] md: use set_capacity_and_notify

Commit Message

Patch