md: rename __mddev_suspend/resume() back to mddev_suspend/resume()

Now that the old apis are removed, __mddev_suspend/resume() can be
renamed to their original names.

This is done by:

sed -i "s/__mddev_suspend/mddev_suspend/g" *.[ch]
sed -i "s/__mddev_resume/mddev_resume/g" *.[ch]

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20231010151958.145896-20-yukuai1@huaweicloud.com

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 05dd6ccf6f48d6aba09e4e669d7819c34f6d2737..a4692f8f98eee91a7f650623a9a8f521db6f8832 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3797,7 +3797,7 @@ static void raid_postsuspend(struct dm_target *ti)
                if (!test_bit(MD_RECOVERY_FROZEN, &rs->md.recovery))
                        md_stop_writes(&rs->md);
 
-               __mddev_suspend(&rs->md, false);
+               mddev_suspend(&rs->md, false);
        }
 }
 
@@ -4009,7 +4009,7 @@ static int raid_preresume(struct dm_target *ti)
        }
 
        /* Check for any resize/reshape on @rs and adjust/initiate */
-       /* Be prepared for __mddev_resume() in raid_resume() */
+       /* Be prepared for mddev_resume() in raid_resume() */
        set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
        if (mddev->recovery_cp && mddev->recovery_cp < MaxSector) {
                set_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 757cd53c0fa17f664da1ffe99a5fe4e145df09d0..8ee079c4dc1e50fabe8afdfd2e2d19b333562d86 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -422,7 +422,7 @@ static void md_submit_bio(struct bio *bio)
  * Make sure no new requests are submitted to the device, and any requests that
  * have been submitted are completely handled.
  */
-int __mddev_suspend(struct mddev *mddev, bool interruptible)
+int mddev_suspend(struct mddev *mddev, bool interruptible)
 {
        int err = 0;
 
@@ -473,9 +473,9 @@ int __mddev_suspend(struct mddev *mddev, bool interruptible)
        mutex_unlock(&mddev->suspend_mutex);
        return 0;
 }
-EXPORT_SYMBOL_GPL(__mddev_suspend);
+EXPORT_SYMBOL_GPL(mddev_suspend);
 
-void __mddev_resume(struct mddev *mddev)
+void mddev_resume(struct mddev *mddev)
 {
        lockdep_assert_not_held(&mddev->reconfig_mutex);
 
@@ -486,7 +486,7 @@ void __mddev_resume(struct mddev *mddev)
                return;
        }
 
-       /* entred the memalloc scope from __mddev_suspend() */
+       /* entred the memalloc scope from mddev_suspend() */
        memalloc_noio_restore(mddev->noio_flag);
 
        percpu_ref_resurrect(&mddev->active_io);
@@ -498,7 +498,7 @@ void __mddev_resume(struct mddev *mddev)
 
        mutex_unlock(&mddev->suspend_mutex);
 }
-EXPORT_SYMBOL_GPL(__mddev_resume);
+EXPORT_SYMBOL_GPL(mddev_resume);
 
 /*
  * Generic flush handling for md
@@ -5219,12 +5219,12 @@ suspend_lo_store(struct mddev *mddev, const char *buf, size_t len)
        if (new != (sector_t)new)
                return -EINVAL;
 
-       err = __mddev_suspend(mddev, true);
+       err = mddev_suspend(mddev, true);
        if (err)
                return err;
 
        WRITE_ONCE(mddev->suspend_lo, new);
-       __mddev_resume(mddev);
+       mddev_resume(mddev);
 
        return len;
 }
@@ -5250,12 +5250,12 @@ suspend_hi_store(struct mddev *mddev, const char *buf, size_t len)
        if (new != (sector_t)new)
                return -EINVAL;
 
-       err = __mddev_suspend(mddev, true);
+       err = mddev_suspend(mddev, true);
        if (err)
                return err;
 
        WRITE_ONCE(mddev->suspend_hi, new);
-       __mddev_resume(mddev);
+       mddev_resume(mddev);
 
        return len;
 }

diff --git a/drivers/md/md.h b/drivers/md/md.h
index 4c5f3f032656754fd07d121e954e2c1daea33158..55d01d4314186d38cd7dc098a5cb29470885b6b0 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -804,8 +804,8 @@ extern int md_rdev_init(struct md_rdev *rdev);
 extern void md_rdev_clear(struct md_rdev *rdev);
 
 extern void md_handle_request(struct mddev *mddev, struct bio *bio);
-extern int __mddev_suspend(struct mddev *mddev, bool interruptible);
-extern void __mddev_resume(struct mddev *mddev);
+extern int mddev_suspend(struct mddev *mddev, bool interruptible);
+extern void mddev_resume(struct mddev *mddev);
 
 extern void md_reload_sb(struct mddev *mddev, int raid_disk);
 extern void md_update_sb(struct mddev *mddev, int force);
@@ -853,27 +853,27 @@ static inline int mddev_suspend_and_lock(struct mddev *mddev)
 {
        int ret;
 
-       ret = __mddev_suspend(mddev, true);
+       ret = mddev_suspend(mddev, true);
        if (ret)
                return ret;
 
        ret = mddev_lock(mddev);
        if (ret)
-               __mddev_resume(mddev);
+               mddev_resume(mddev);
 
        return ret;
 }
 
 static inline void mddev_suspend_and_lock_nointr(struct mddev *mddev)
 {
-       __mddev_suspend(mddev, false);
+       mddev_suspend(mddev, false);
        mutex_lock(&mddev->reconfig_mutex);
 }
 
 static inline void mddev_unlock_and_resume(struct mddev *mddev)
 {
        mddev_unlock(mddev);
-       __mddev_resume(mddev);
+       mddev_resume(mddev);
 }
 
 struct mdu_array_info_s;

diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 9909110262eed4b5d3f423e3f11f5b2f35548157..6157f5beb9fe30e180059216e350ec6784395646 100644 (file)
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -699,9 +699,9 @@ static void r5c_disable_writeback_async(struct work_struct *work)
 
        log = READ_ONCE(conf->log);
        if (log) {
-               __mddev_suspend(mddev, false);
+               mddev_suspend(mddev, false);
                log->r5c_journal_mode = R5C_JOURNAL_MODE_WRITE_THROUGH;
-               __mddev_resume(mddev);
+               mddev_resume(mddev);
        }
 }