aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@notabene.brown>2008-06-27 18:31:29 -0400
committerNeil Brown <neilb@notabene.brown>2008-06-27 18:31:29 -0400
commit8ed0a5216a0238f53b482ec88ce4aeed4b9f0da1 (patch)
tree31383b73c6d471dc8620b0bda044d5d514fd1d8b
parent1a0fd497733bd029a7d5f2e5c69b1dff715b7792 (diff)
Enable setting of 'offset' and 'size' of a hot-added spare.
offset_store and rdev_size_store allow control of the region of a device which is to be using in an md/raid array. They only allow these values to be set when an array is being assembled, as changing them on an active array could be dangerous. However when adding a spare device to an array, we might need to set the offset and size before starting recovery. So allow these values to be set also if "->raid_disk < 0" which indicates that the device is still a spare. Signed-off-by: Neil Brown <neilb@suse.de>
-rw-r--r--drivers/md/md.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9e3ce432e37e..3b5cd4ef54f1 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1984,7 +1984,7 @@ offset_store(mdk_rdev_t *rdev, const char *buf, size_t len)
1984 unsigned long long offset = simple_strtoull(buf, &e, 10); 1984 unsigned long long offset = simple_strtoull(buf, &e, 10);
1985 if (e==buf || (*e && *e != '\n')) 1985 if (e==buf || (*e && *e != '\n'))
1986 return -EINVAL; 1986 return -EINVAL;
1987 if (rdev->mddev->pers) 1987 if (rdev->mddev->pers && rdev->raid_disk >= 0)
1988 return -EBUSY; 1988 return -EBUSY;
1989 if (rdev->size && rdev->mddev->external) 1989 if (rdev->size && rdev->mddev->external)
1990 /* Must set offset before size, so overlap checks 1990 /* Must set offset before size, so overlap checks
@@ -2023,7 +2023,7 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)
2023 2023
2024 if (e==buf || (*e && *e != '\n')) 2024 if (e==buf || (*e && *e != '\n'))
2025 return -EINVAL; 2025 return -EINVAL;
2026 if (my_mddev->pers) 2026 if (my_mddev->pers && rdev->raid_disk >= 0)
2027 return -EBUSY; 2027 return -EBUSY;
2028 rdev->size = size; 2028 rdev->size = size;
2029 if (size > oldsize && rdev->mddev->external) { 2029 if (size > oldsize && rdev->mddev->external) {