md: clean up openers check in do_md_stop() and md_set_readonly()

Before stopping or setting readonly, mddev_set_closing_and_sync_blockdev()
is always called to check the openers. So no longer need to check it again
in do_md_stop() and md_set_readonly(). Clean it up.

Signed-off-by: Li Nan <linan122@huawei.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20240226031444.3606764-9-linan666@huaweicloud.com

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3b653e68db0c2998824439d644f386d84eb63463..9b61e4cf796be6c4e9e6ce72375259b4cbee7fb5 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4482,8 +4482,8 @@ array_state_show(struct mddev *mddev, char *page)
        return sprintf(page, "%s\n", array_states[st]);
 }
 
-static int do_md_stop(struct mddev *mddev, int ro, struct block_device *bdev);
-static int md_set_readonly(struct mddev *mddev, struct block_device *bdev);
+static int do_md_stop(struct mddev *mddev, int ro);
+static int md_set_readonly(struct mddev *mddev);
 static int restart_array(struct mddev *mddev);
 
 static ssize_t
@@ -4544,14 +4544,14 @@ array_state_store(struct mddev *mddev, const char *buf, size_t len)
        case inactive:
                /* stop an active array, return 0 otherwise */
                if (mddev->pers)
-                       err = do_md_stop(mddev, 2, NULL);
+                       err = do_md_stop(mddev, 2);
                break;
        case clear:
-               err = do_md_stop(mddev, 0, NULL);
+               err = do_md_stop(mddev, 0);
                break;
        case readonly:
                if (mddev->pers)
-                       err = md_set_readonly(mddev, NULL);
+                       err = md_set_readonly(mddev);
                else {
                        mddev->ro = MD_RDONLY;
                        set_disk_ro(mddev->gendisk, 1);
@@ -4561,7 +4561,7 @@ array_state_store(struct mddev *mddev, const char *buf, size_t len)
        case read_auto:
                if (mddev->pers) {
                        if (md_is_rdwr(mddev))
-                               err = md_set_readonly(mddev, NULL);
+                               err = md_set_readonly(mddev);
                        else if (mddev->ro == MD_RDONLY)
                                err = restart_array(mddev);
                        if (err == 0) {
@@ -6420,7 +6420,7 @@ void md_stop(struct mddev *mddev)
 
 EXPORT_SYMBOL_GPL(md_stop);
 
-static int md_set_readonly(struct mddev *mddev, struct block_device *bdev)
+static int md_set_readonly(struct mddev *mddev)
 {
        int err = 0;
        int did_freeze = 0;
@@ -6438,9 +6438,7 @@ static int md_set_readonly(struct mddev *mddev, struct block_device *bdev)
                   !test_bit(MD_SB_CHANGE_PENDING, &mddev->sb_flags));
        mddev_lock_nointr(mddev);
 
-       mutex_lock(&mddev->open_mutex);
-       if ((mddev->pers && atomic_read(&mddev->openers) > !!bdev) ||
-           test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) {
+       if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) {
                pr_warn("md: %s still in use.\n",mdname(mddev));
                err = -EBUSY;
                goto out;
@@ -6465,7 +6463,6 @@ out:
                sysfs_notify_dirent_safe(mddev->sysfs_state);
        }
 
-       mutex_unlock(&mddev->open_mutex);
        return err;
 }
 
@@ -6473,8 +6470,7 @@ out:
  *   0 - completely stop and dis-assemble array
  *   2 - stop but do not disassemble array
  */
-static int do_md_stop(struct mddev *mddev, int mode,
-                     struct block_device *bdev)
+static int do_md_stop(struct mddev *mddev, int mode)
 {
        struct gendisk *disk = mddev->gendisk;
        struct md_rdev *rdev;
@@ -6487,12 +6483,9 @@ static int do_md_stop(struct mddev *mddev, int mode,
 
        stop_sync_thread(mddev, true, false);
 
-       mutex_lock(&mddev->open_mutex);
-       if ((mddev->pers && atomic_read(&mddev->openers) > !!bdev) ||
-           mddev->sysfs_active ||
+       if (mddev->sysfs_active ||
            test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) {
                pr_warn("md: %s still in use.\n",mdname(mddev));
-               mutex_unlock(&mddev->open_mutex);
                if (did_freeze) {
                        clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
                        set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
@@ -6514,13 +6507,11 @@ static int do_md_stop(struct mddev *mddev, int mode,
                                sysfs_unlink_rdev(mddev, rdev);
 
                set_capacity_and_notify(disk, 0);
-               mutex_unlock(&mddev->open_mutex);
                mddev->changed = 1;
 
                if (!md_is_rdwr(mddev))
                        mddev->ro = MD_RDWR;
-       } else
-               mutex_unlock(&mddev->open_mutex);
+       }
        /*
         * Free resources if final stop
         */
@@ -6566,7 +6557,7 @@ static void autorun_array(struct mddev *mddev)
        err = do_md_run(mddev);
        if (err) {
                pr_warn("md: do_md_run() returned %d\n", err);
-               do_md_stop(mddev, 0, NULL);
+               do_md_stop(mddev, 0);
        }
 }
 
@@ -7735,11 +7726,11 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
                goto unlock;
 
        case STOP_ARRAY:
-               err = do_md_stop(mddev, 0, bdev);
+               err = do_md_stop(mddev, 0);
                goto unlock;
 
        case STOP_ARRAY_RO:
-               err = md_set_readonly(mddev, bdev);
+               err = md_set_readonly(mddev);
                goto unlock;
 
        case HOT_REMOVE_DISK: