Commit 2b16a525 authored by Yu Kuai's avatar Yu Kuai Committed by Song Liu

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: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20231010151958.145896-20-yukuai1@huaweicloud.com
parent 4717c028
...@@ -3797,7 +3797,7 @@ static void raid_postsuspend(struct dm_target *ti) ...@@ -3797,7 +3797,7 @@ static void raid_postsuspend(struct dm_target *ti)
if (!test_bit(MD_RECOVERY_FROZEN, &rs->md.recovery)) if (!test_bit(MD_RECOVERY_FROZEN, &rs->md.recovery))
md_stop_writes(&rs->md); 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) ...@@ -4009,7 +4009,7 @@ static int raid_preresume(struct dm_target *ti)
} }
/* Check for any resize/reshape on @rs and adjust/initiate */ /* 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); set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
if (mddev->recovery_cp && mddev->recovery_cp < MaxSector) { if (mddev->recovery_cp && mddev->recovery_cp < MaxSector) {
set_bit(MD_RECOVERY_REQUESTED, &mddev->recovery); set_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
......
...@@ -422,7 +422,7 @@ static void md_submit_bio(struct bio *bio) ...@@ -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 * Make sure no new requests are submitted to the device, and any requests that
* have been submitted are completely handled. * 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; int err = 0;
...@@ -473,9 +473,9 @@ int __mddev_suspend(struct mddev *mddev, bool interruptible) ...@@ -473,9 +473,9 @@ int __mddev_suspend(struct mddev *mddev, bool interruptible)
mutex_unlock(&mddev->suspend_mutex); mutex_unlock(&mddev->suspend_mutex);
return 0; 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); lockdep_assert_not_held(&mddev->reconfig_mutex);
...@@ -486,7 +486,7 @@ void __mddev_resume(struct mddev *mddev) ...@@ -486,7 +486,7 @@ void __mddev_resume(struct mddev *mddev)
return; return;
} }
/* entred the memalloc scope from __mddev_suspend() */ /* entred the memalloc scope from mddev_suspend() */
memalloc_noio_restore(mddev->noio_flag); memalloc_noio_restore(mddev->noio_flag);
percpu_ref_resurrect(&mddev->active_io); percpu_ref_resurrect(&mddev->active_io);
...@@ -498,7 +498,7 @@ void __mddev_resume(struct mddev *mddev) ...@@ -498,7 +498,7 @@ void __mddev_resume(struct mddev *mddev)
mutex_unlock(&mddev->suspend_mutex); mutex_unlock(&mddev->suspend_mutex);
} }
EXPORT_SYMBOL_GPL(__mddev_resume); EXPORT_SYMBOL_GPL(mddev_resume);
/* /*
* Generic flush handling for md * Generic flush handling for md
...@@ -5219,12 +5219,12 @@ suspend_lo_store(struct mddev *mddev, const char *buf, size_t len) ...@@ -5219,12 +5219,12 @@ suspend_lo_store(struct mddev *mddev, const char *buf, size_t len)
if (new != (sector_t)new) if (new != (sector_t)new)
return -EINVAL; return -EINVAL;
err = __mddev_suspend(mddev, true); err = mddev_suspend(mddev, true);
if (err) if (err)
return err; return err;
WRITE_ONCE(mddev->suspend_lo, new); WRITE_ONCE(mddev->suspend_lo, new);
__mddev_resume(mddev); mddev_resume(mddev);
return len; return len;
} }
...@@ -5250,12 +5250,12 @@ suspend_hi_store(struct mddev *mddev, const char *buf, size_t len) ...@@ -5250,12 +5250,12 @@ suspend_hi_store(struct mddev *mddev, const char *buf, size_t len)
if (new != (sector_t)new) if (new != (sector_t)new)
return -EINVAL; return -EINVAL;
err = __mddev_suspend(mddev, true); err = mddev_suspend(mddev, true);
if (err) if (err)
return err; return err;
WRITE_ONCE(mddev->suspend_hi, new); WRITE_ONCE(mddev->suspend_hi, new);
__mddev_resume(mddev); mddev_resume(mddev);
return len; return len;
} }
......
...@@ -804,8 +804,8 @@ extern int md_rdev_init(struct md_rdev *rdev); ...@@ -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_rdev_clear(struct md_rdev *rdev);
extern void md_handle_request(struct mddev *mddev, struct bio *bio); extern void md_handle_request(struct mddev *mddev, struct bio *bio);
extern int __mddev_suspend(struct mddev *mddev, bool interruptible); extern int mddev_suspend(struct mddev *mddev, bool interruptible);
extern void __mddev_resume(struct mddev *mddev); extern void mddev_resume(struct mddev *mddev);
extern void md_reload_sb(struct mddev *mddev, int raid_disk); extern void md_reload_sb(struct mddev *mddev, int raid_disk);
extern void md_update_sb(struct mddev *mddev, int force); extern void md_update_sb(struct mddev *mddev, int force);
...@@ -853,27 +853,27 @@ static inline int mddev_suspend_and_lock(struct mddev *mddev) ...@@ -853,27 +853,27 @@ static inline int mddev_suspend_and_lock(struct mddev *mddev)
{ {
int ret; int ret;
ret = __mddev_suspend(mddev, true); ret = mddev_suspend(mddev, true);
if (ret) if (ret)
return ret; return ret;
ret = mddev_lock(mddev); ret = mddev_lock(mddev);
if (ret) if (ret)
__mddev_resume(mddev); mddev_resume(mddev);
return ret; return ret;
} }
static inline void mddev_suspend_and_lock_nointr(struct mddev *mddev) static inline void mddev_suspend_and_lock_nointr(struct mddev *mddev)
{ {
__mddev_suspend(mddev, false); mddev_suspend(mddev, false);
mutex_lock(&mddev->reconfig_mutex); mutex_lock(&mddev->reconfig_mutex);
} }
static inline void mddev_unlock_and_resume(struct mddev *mddev) static inline void mddev_unlock_and_resume(struct mddev *mddev)
{ {
mddev_unlock(mddev); mddev_unlock(mddev);
__mddev_resume(mddev); mddev_resume(mddev);
} }
struct mdu_array_info_s; struct mdu_array_info_s;
......
...@@ -699,9 +699,9 @@ static void r5c_disable_writeback_async(struct work_struct *work) ...@@ -699,9 +699,9 @@ static void r5c_disable_writeback_async(struct work_struct *work)
log = READ_ONCE(conf->log); log = READ_ONCE(conf->log);
if (log) { if (log) {
__mddev_suspend(mddev, false); mddev_suspend(mddev, false);
log->r5c_journal_mode = R5C_JOURNAL_MODE_WRITE_THROUGH; log->r5c_journal_mode = R5C_JOURNAL_MODE_WRITE_THROUGH;
__mddev_resume(mddev); mddev_resume(mddev);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment