From: Yu Kuai <yukuai3@xxxxxxxxxx>
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@xxxxxxxxxx>
---
drivers/md/dm-raid.c | 4 ++--
drivers/md/md.c | 30 +++++++++++++++---------------
drivers/md/md.h | 16 ++++++++--------
drivers/md/raid5-cache.c | 4 ++--
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 2ff33b5d9a1b..5114daead945 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3799,7 +3799,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);
+ mddev_suspend(&rs->md);
}
}
@@ -4011,7 +4011,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 bb67734eded6..3afaf960aa4a 100644
--- 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.
*/
-void __mddev_suspend(struct mddev *mddev)
+void mddev_suspend(struct mddev *mddev)
{
/*
@@ -456,9 +456,9 @@ void __mddev_suspend(struct mddev *mddev)
mutex_unlock(&mddev->suspend_mutex);
}
-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);
@@ -469,7 +469,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);
@@ -481,7 +481,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
@@ -3609,7 +3609,7 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr,
if (cmd_match(page, "remove") || cmd_match(page, "re-add") ||
cmd_match(page, "writemostly") ||
cmd_match(page, "-writemostly")) {
- __mddev_suspend(mddev);
+ mddev_suspend(mddev);
suspended = true;
}
}
@@ -3623,7 +3623,7 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr,
mddev_unlock(mddev);
if (suspended)
- __mddev_resume(mddev);
+ mddev_resume(mddev);
}
if (kn)
@@ -5197,9 +5197,9 @@ suspend_lo_store(struct mddev *mddev, const char *buf, size_t len)
if (new != (sector_t)new)
return -EINVAL;
- __mddev_suspend(mddev);
+ mddev_suspend(mddev);
WRITE_ONCE(mddev->suspend_lo, new);
- __mddev_resume(mddev);
+ mddev_resume(mddev);
return len;
}
@@ -5225,9 +5225,9 @@ suspend_hi_store(struct mddev *mddev, const char *buf, size_t len)
if (new != (sector_t)new)
return -EINVAL;
- __mddev_suspend(mddev);
+ mddev_suspend(mddev);
WRITE_ONCE(mddev->suspend_hi, new);
- __mddev_resume(mddev);
+ mddev_resume(mddev);
return len;
}
@@ -7789,7 +7789,7 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
mddev_unlock(mddev);
if (md_ioctl_need_suspend(cmd))
- __mddev_resume(mddev);
+ mddev_resume(mddev);
out:
if(did_set_md_closing)
@@ -9383,7 +9383,7 @@ static void md_start_sync(struct work_struct *ws)
bool suspended = false;
if (md_spares_need_change(mddev)) {
- __mddev_suspend(mddev);
+ mddev_suspend(mddev);
suspended = true;
}
@@ -9425,7 +9425,7 @@ static void md_start_sync(struct work_struct *ws)
mddev_unlock(mddev);
if (suspended)
- __mddev_resume(mddev);
+ mddev_resume(mddev);
md_wakeup_thread(mddev->sync_thread);
sysfs_notify_dirent_safe(mddev->sysfs_action);
@@ -9440,7 +9440,7 @@ static void md_start_sync(struct work_struct *ws)
clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
mddev_unlock(mddev);
if (suspended)
- __mddev_resume(mddev);
+ mddev_resume(mddev);
wake_up(&resync_wait);
if (test_and_clear_bit(MD_RECOVERY_RECOVER, &mddev->recovery) &&
diff --git a/drivers/md/md.h b/drivers/md/md.h
index f932d0cb9db0..fc64dea4f84d 100644
--- 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 void __mddev_suspend(struct mddev *mddev);
-extern void __mddev_resume(struct mddev *mddev);
+extern void mddev_suspend(struct mddev *mddev);
+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,17 +853,17 @@ static inline int mddev_suspend_and_lock(struct mddev *mddev)
{
int ret;
- __mddev_suspend(mddev);
+ mddev_suspend(mddev);
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);
+ mddev_suspend(mddev);
mutex_lock(&mddev->reconfig_mutex);
}
@@ -871,10 +871,10 @@ static inline int mddev_suspend_and_trylock(struct mddev *mddev)
{
int ret;
- __mddev_suspend(mddev);
+ mddev_suspend(mddev);
ret = mutex_trylock(&mddev->reconfig_mutex);
if (ret)
- __mddev_resume(mddev);
+ mddev_resume(mddev);
return ret;
}
@@ -882,7 +882,7 @@ static inline int mddev_suspend_and_trylock(struct mddev *mddev)
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 38d38f2e33bc..4dc69826a5d3 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -698,9 +698,9 @@ static void r5c_disable_writeback_async(struct work_struct *work)
!test_bit(MD_SB_CHANGE_PENDING, &mddev->sb_flags));
if (READ_ONCE(conf->log)) {
- __mddev_suspend(mddev);
+ mddev_suspend(mddev);
log->r5c_journal_mode = R5C_JOURNAL_MODE_WRITE_THROUGH;
- __mddev_resume(mddev);
+ mddev_resume(mddev);
}
}
--
2.39.2
