* [PATCH] Fix remove_and_add_spares removes drive added as spare in slot_store
@ 2015-12-17 13:45 rgoldwyn
2015-12-18 1:10 ` NeilBrown
0 siblings, 1 reply; 2+ messages in thread
From: rgoldwyn @ 2015-12-17 13:45 UTC (permalink / raw)
To: linux-raid, neilb; +Cc: pawel.baldysiak, Goldwyn Rodrigues
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Commit 2910ff17d154baa5eb50e362a91104e831eb2bb6
introduced a regression which would remove a recently added spare via
slot_store. Revert part of the patch which touches slot_store() and add
the disk directly using pers->hot_add_disk()
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
---
drivers/md/md.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index a71b36f..0444afa 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2726,6 +2726,7 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)
/* Activating a spare .. or possibly reactivating
* if we ever get bitmaps working here.
*/
+ int err;
if (rdev->raid_disk != -1)
return -EBUSY;
@@ -2747,9 +2748,15 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)
rdev->saved_raid_disk = -1;
clear_bit(In_sync, &rdev->flags);
clear_bit(Bitmap_sync, &rdev->flags);
- remove_and_add_spares(rdev->mddev, rdev);
- if (rdev->raid_disk == -1)
- return -EBUSY;
+ err = rdev->mddev->pers->
+ hot_add_disk(rdev->mddev, rdev);
+ if (err) {
+ rdev->raid_disk = -1;
+ return err;
+ } else
+ sysfs_notify_dirent_safe(rdev->sysfs_state);
+ if (sysfs_link_rdev(rdev->mddev, rdev))
+ /* failure here is OK */;
/* don't wakeup anyone, leave that to userspace. */
} else {
if (slot >= rdev->mddev->raid_disks &&
--
2.6.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix remove_and_add_spares removes drive added as spare in slot_store
2015-12-17 13:45 [PATCH] Fix remove_and_add_spares removes drive added as spare in slot_store rgoldwyn
@ 2015-12-18 1:10 ` NeilBrown
0 siblings, 0 replies; 2+ messages in thread
From: NeilBrown @ 2015-12-18 1:10 UTC (permalink / raw)
To: rgoldwyn, linux-raid; +Cc: pawel.baldysiak, Goldwyn Rodrigues
[-- Attachment #1: Type: text/plain, Size: 1732 bytes --]
On Fri, Dec 18 2015, rgoldwyn@suse.de wrote:
> From: Goldwyn Rodrigues <rgoldwyn@suse.com>
>
> Commit 2910ff17d154baa5eb50e362a91104e831eb2bb6
> introduced a regression which would remove a recently added spare via
> slot_store. Revert part of the patch which touches slot_store() and add
> the disk directly using pers->hot_add_disk()
>
> Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
> Signed-off-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
> ---
> drivers/md/md.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index a71b36f..0444afa 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -2726,6 +2726,7 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)
> /* Activating a spare .. or possibly reactivating
> * if we ever get bitmaps working here.
> */
> + int err;
>
> if (rdev->raid_disk != -1)
> return -EBUSY;
> @@ -2747,9 +2748,15 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)
> rdev->saved_raid_disk = -1;
> clear_bit(In_sync, &rdev->flags);
> clear_bit(Bitmap_sync, &rdev->flags);
> - remove_and_add_spares(rdev->mddev, rdev);
> - if (rdev->raid_disk == -1)
> - return -EBUSY;
> + err = rdev->mddev->pers->
> + hot_add_disk(rdev->mddev, rdev);
> + if (err) {
> + rdev->raid_disk = -1;
> + return err;
> + } else
> + sysfs_notify_dirent_safe(rdev->sysfs_state);
> + if (sysfs_link_rdev(rdev->mddev, rdev))
> + /* failure here is OK */;
> /* don't wakeup anyone, leave that to userspace. */
> } else {
> if (slot >= rdev->mddev->raid_disks &&
> --
> 2.6.2
applied, thanks.
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-18 1:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-17 13:45 [PATCH] Fix remove_and_add_spares removes drive added as spare in slot_store rgoldwyn
2015-12-18 1:10 ` NeilBrown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.