__ref_is_percpu() is documented as an internal interface, so best not to use it. We don't really need it, as ->sync_checkers is always 0 when the writes_pending is in per-cpu mode. So change to test ->sync_checkers, and update comments to match. Signed-off-by: NeilBrown <neilb@xxxxxxxx> --- Sorry, there was an undefined variable in that version. This one is better. NeilBrown drivers/md/md.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index adf2b5bdfd67..aeed8adeb5f1 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2266,8 +2266,8 @@ static bool set_in_sync(struct mddev *mddev) percpu_ref_is_zero(&mddev->writes_pending)) { mddev->in_sync = 1; /* - * Ensure in_sync is visible before switch back - * to percpu + * Ensure ->in_sync is visible before we clear + * ->sync_checkers. */ smp_mb(); set_bit(MD_SB_CHANGE_CLEAN, &mddev->sb_flags); @@ -7901,7 +7901,6 @@ EXPORT_SYMBOL(md_done_sync); */ void md_write_start(struct mddev *mddev, struct bio *bi) { - unsigned long __percpu *notused; int did_change = 0; if (bio_data_dir(bi) != WRITE) return; @@ -7920,7 +7919,7 @@ void md_write_start(struct mddev *mddev, struct bio *bi) smp_mb(); /* Match smp_mb in set_in_sync() */ if (mddev->safemode == 1) mddev->safemode = 0; - if (mddev->in_sync || !__ref_is_percpu(&mddev->writes_pending, ¬used)) { + if (mddev->in_sync || !mddev->sync_checkers) { spin_lock(&mddev->lock); if (mddev->in_sync) { mddev->in_sync = 0; -- 2.12.0
Attachment:
signature.asc
Description: PGP signature