dm raid: make rs_set_capacity to work on shrinking reshape

Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index cc6eb7c27a7dac8c9abfba737f51718f1f45d5bb..62e31b47400c4a47a6cb60c83af43e5a5b15af9f 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -617,9 +617,7 @@ static void rs_set_capacity(struct raid_set *rs)
 {
        struct mddev *mddev = &rs->md;
 
-       /* Make sure we access most actual mddev properties */
-       smp_rmb();
-       if (rs->ti->len != mddev->array_sectors && !rs_is_reshaping(rs)) {
+       if (rs->ti->len != mddev->array_sectors) {
                struct gendisk *gendisk = dm_disk(dm_table_get_md(rs->ti->table));
 
                set_capacity(gendisk, mddev->array_sectors);
@@ -1471,7 +1469,9 @@ static void do_table_event(struct work_struct *ws)
 {
        struct raid_set *rs = container_of(ws, struct raid_set, md.event_work);
 
-       rs_set_capacity(rs);
+       smp_rmb(); /* Make sure we access most actual mddev properties */
+       if (!rs_is_reshaping(rs))
+               rs_set_capacity(rs);
        dm_table_event(rs->ti->table);
 }