md: remove rd%d links immediately after stopping an array.

md maintains link in sys/mdXX/md/ to identify which device has
which role in the array. e.g.
rd2 -> dev-sda

indicates that the device with role '2' in the array is sda.

These links are only present when the array is active. They are
created immediately after ->run is called, and so should be removed
immediately after ->stop is called.
However they are currently removed a little bit later, and it is
possible for ->run to be called again, thus adding these links, before
they are removed.

So move the removal earlier so they are consistently only present when
the array is active.

Signed-off-by: NeilBrown <neilb@suse.de>

NeilBrown c4647292 5bf29597

+8 -8
+8 -8
drivers/md/md.c
··· 4294 { 4295 int err = 0; 4296 struct gendisk *disk = mddev->gendisk; 4297 4298 if (atomic_read(&mddev->openers) > is_open) { 4299 printk("md: %s still in use.\n",mdname(mddev)); ··· 4337 /* tell userspace to handle 'inactive' */ 4338 sysfs_notify_dirent(mddev->sysfs_state); 4339 4340 set_capacity(disk, 0); 4341 mddev->changed = 1; 4342 ··· 4364 * Free resources if final stop 4365 */ 4366 if (mode == 0) { 4367 - mdk_rdev_t *rdev; 4368 4369 printk(KERN_INFO "md: %s stopped.\n", mdname(mddev)); 4370 ··· 4374 mddev->bitmap_file = NULL; 4375 } 4376 mddev->bitmap_offset = 0; 4377 - 4378 - list_for_each_entry(rdev, &mddev->disks, same_set) 4379 - if (rdev->raid_disk >= 0) { 4380 - char nm[20]; 4381 - sprintf(nm, "rd%d", rdev->raid_disk); 4382 - sysfs_remove_link(&mddev->kobj, nm); 4383 - } 4384 4385 /* make sure all md_delayed_delete calls have finished */ 4386 flush_scheduled_work();
··· 4294 { 4295 int err = 0; 4296 struct gendisk *disk = mddev->gendisk; 4297 + mdk_rdev_t *rdev; 4298 4299 if (atomic_read(&mddev->openers) > is_open) { 4300 printk("md: %s still in use.\n",mdname(mddev)); ··· 4336 /* tell userspace to handle 'inactive' */ 4337 sysfs_notify_dirent(mddev->sysfs_state); 4338 4339 + list_for_each_entry(rdev, &mddev->disks, same_set) 4340 + if (rdev->raid_disk >= 0) { 4341 + char nm[20]; 4342 + sprintf(nm, "rd%d", rdev->raid_disk); 4343 + sysfs_remove_link(&mddev->kobj, nm); 4344 + } 4345 + 4346 set_capacity(disk, 0); 4347 mddev->changed = 1; 4348 ··· 4356 * Free resources if final stop 4357 */ 4358 if (mode == 0) { 4359 4360 printk(KERN_INFO "md: %s stopped.\n", mdname(mddev)); 4361 ··· 4367 mddev->bitmap_file = NULL; 4368 } 4369 mddev->bitmap_offset = 0; 4370 4371 /* make sure all md_delayed_delete calls have finished */ 4372 flush_scheduled_work();