md: manage redundancy group in sysfs when changing level.

Some levels expect the 'redundancy group' to be present,
others don't.
So when we change level of an array we might need to
add or remove this group.

This requires fixing up the current practice of overloading ->private
to indicate (when ->pers == NULL) that something needs to be removed.
So create a new ->to_remove to fill that role.

When changing levels, we may need to add or remove attributes.  When
changing RAID5 -> RAID6, we both add and remove the same thing.  It is
important to catch this and optimise it out as the removal is delayed
until a lock is released, so trying to add immediately would cause
problems.


Cc: stable@kernel.org
Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 70ffbd071b2e..a361398875d0 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5090,7 +5090,9 @@ static int run(mddev_t *mddev)
         }
 
         /* Ok, everything is just fine now */
-        if (sysfs_create_group(&mddev->kobj, &raid5_attrs_group))
+        if (mddev->to_remove == &raid5_attrs_group)
+                mddev->to_remove = NULL;
+        else if (sysfs_create_group(&mddev->kobj, &raid5_attrs_group))
                 printk(KERN_WARNING
                        "raid5: failed to create sysfs attributes for %s\n",
                        mdname(mddev));
@@ -5137,7 +5139,8 @@ static int stop(mddev_t *mddev)
         mddev->queue->backing_dev_info.congested_fn = NULL;
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
         free_conf(conf);
-        mddev->private = &raid5_attrs_group;
+        mddev->private = NULL;
+        mddev->to_remove = &raid5_attrs_group;
         return 0;
 }