Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / md / md-cluster.c

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index f0e64e7..7fbd41e 100644 (file)
--- 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);
@@ -1304,13 +1303,10 @@ 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);
-               if (!ret)
-                       revalidate_disk_size(mddev->gendisk, true);
                ret = __sendmsg(cinfo, &cmsg);
                if (ret)
                        pr_err("%s:%d: failed to send METADATA_UPDATED msg\n",