From: Yu Kuai <yukuai3@xxxxxxxxxx>
'pers->prepare_suspend' is introduced to prevent a deadlock for raid456,
this change prepares to clean this up in later patches while refactoring
mddev_suspend().
Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx>
---
drivers/md/md.c | 2 +-
drivers/md/md.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 5aa9f62a7c56..89f5175b1295 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -354,7 +354,7 @@ static DEFINE_SPINLOCK(all_mddevs_lock);
*/
static bool is_suspended(struct mddev *mddev, struct bio *bio)
{
- if (is_md_suspended(mddev))
+ if (is_md_suspended(mddev) || percpu_ref_is_dying(&mddev->active_io))
return true;
if (bio_data_dir(bio) != WRITE)
return false;
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 343dd89c13cf..82d2c4ed9aca 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -576,7 +576,7 @@ static inline bool md_is_rdwr(struct mddev *mddev)
static inline bool is_md_suspended(struct mddev *mddev)
{
- return percpu_ref_is_dying(&mddev->active_io);
+ return READ_ONCE(mddev->suspended) != 0;
}
static inline int __must_check mddev_lock(struct mddev *mddev)
--
2.39.2
