Skip to content

Commit c7bfced

Browse files
djbwaxboe
authored andcommitted
md: suspend i/o during runtime blk_integrity_unregister
Synchronize pending i/o against a change in the integrity profile to avoid the possibility of spurious integrity errors. Given linear_add() is suspending the mddev before manipulating the mddev, do the same for the other personalities. Acked-by: NeilBrown <[email protected]> Signed-off-by: Dan Williams <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 9609b99 commit c7bfced

File tree

4 files changed

+7
-0
lines changed

4 files changed

+7
-0
lines changed

drivers/md/md.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,6 +1994,7 @@ void md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev)
19941994
if (bi_rdev && blk_integrity_compare(mddev->gendisk,
19951995
rdev->bdev->bd_disk) >= 0)
19961996
return;
1997+
WARN_ON_ONCE(!mddev->suspended);
19971998
printk(KERN_NOTICE "disabling data integrity on %s\n", mdname(mddev));
19981999
blk_integrity_unregister(mddev->gendisk);
19992000
}

drivers/md/multipath.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,9 @@ static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev)
264264
spin_unlock_irq(&conf->device_lock);
265265
rcu_assign_pointer(p->rdev, rdev);
266266
err = 0;
267+
mddev_suspend(mddev);
267268
md_integrity_add_rdev(rdev, mddev);
269+
mddev_resume(mddev);
268270
break;
269271
}
270272

drivers/md/raid1.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,9 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)
16211621
break;
16221622
}
16231623
}
1624+
mddev_suspend(mddev);
16241625
md_integrity_add_rdev(rdev, mddev);
1626+
mddev_resume(mddev);
16251627
if (mddev->queue && blk_queue_discard(bdev_get_queue(rdev->bdev)))
16261628
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);
16271629
print_conf(conf);

drivers/md/raid10.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,7 +1736,9 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
17361736
rcu_assign_pointer(p->rdev, rdev);
17371737
break;
17381738
}
1739+
mddev_suspend(mddev);
17391740
md_integrity_add_rdev(rdev, mddev);
1741+
mddev_resume(mddev);
17401742
if (mddev->queue && blk_queue_discard(bdev_get_queue(rdev->bdev)))
17411743
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);
17421744

0 commit comments

Comments
 (0)