[PATCH] md: allow an md personality to refuse a hot-remove request.

This isn't really needed at the moment, but it is more consistant with the
interface and may be needed later.

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index d6a0258afc78dc0ae1d196897f202ea0acba2eef..d7fbdca3fa10e589bb3ab1f6358816e70c7690be 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3445,8 +3445,8 @@ void md_check_recovery(mddev_t *mddev)
                        if (rdev->raid_disk >= 0 &&
                            rdev->faulty &&
                            atomic_read(&rdev->nr_pending)==0) {
-                               mddev->pers->hot_remove_disk(mddev, rdev->raid_disk);
-                               rdev->raid_disk = -1;
+                               if (mddev->pers->hot_remove_disk(mddev, rdev->raid_disk)==0)
+                                       rdev->raid_disk = -1;
                        }
                        if (!rdev->faulty && rdev->raid_disk >= 0 && !rdev->in_sync)
                                spares++;