Introduce sys_hot_remove_disk()
The new hot_remove_disk() will retry HOT_REMOVE_DISK several times in the face of EBUSY. However we sometimes remove a device by writing "remove" to the "state" attributed. This should be retried as well. So introduce sys_hot_remove_disk() to repeat this action a few times. Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
This commit is contained in:
parent
1b4944f3a1
commit
fdd015696c
6
Manage.c
6
Manage.c
|
@ -1177,11 +1177,7 @@ int Manage_remove(struct supertype *tst, int fd, struct mddev_dev *dv,
|
||||||
/* device has been removed and we don't know
|
/* device has been removed and we don't know
|
||||||
* the major:minor number
|
* the major:minor number
|
||||||
*/
|
*/
|
||||||
int n = write(sysfd, "remove", 6);
|
err = sys_hot_remove_disk(sysfd);
|
||||||
if (n != 6)
|
|
||||||
err = -1;
|
|
||||||
else
|
|
||||||
err = 0;
|
|
||||||
} else {
|
} else {
|
||||||
err = hot_remove_disk(fd, rdev);
|
err = hot_remove_disk(fd, rdev);
|
||||||
if (err && errno == ENODEV) {
|
if (err && errno == ENODEV) {
|
||||||
|
|
1
mdadm.h
1
mdadm.h
|
@ -1477,6 +1477,7 @@ extern int add_disk(int mdfd, struct supertype *st,
|
||||||
extern int remove_disk(int mdfd, struct supertype *st,
|
extern int remove_disk(int mdfd, struct supertype *st,
|
||||||
struct mdinfo *sra, struct mdinfo *info);
|
struct mdinfo *sra, struct mdinfo *info);
|
||||||
extern int hot_remove_disk(int mdfd, unsigned long dev);
|
extern int hot_remove_disk(int mdfd, unsigned long dev);
|
||||||
|
extern int sys_hot_remove_disk(int statefd);
|
||||||
extern int set_array_info(int mdfd, struct supertype *st, struct mdinfo *info);
|
extern int set_array_info(int mdfd, struct supertype *st, struct mdinfo *info);
|
||||||
unsigned long long min_recovery_start(struct mdinfo *array);
|
unsigned long long min_recovery_start(struct mdinfo *array);
|
||||||
|
|
||||||
|
|
12
util.c
12
util.c
|
@ -1813,6 +1813,18 @@ int hot_remove_disk(int mdfd, unsigned long dev)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int sys_hot_remove_disk(int statefd)
|
||||||
|
{
|
||||||
|
int cnt = 5;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
while ((ret = write(statefd, "remove", 6)) == -1 &&
|
||||||
|
errno == EBUSY &&
|
||||||
|
cnt-- > 0)
|
||||||
|
usleep(10000);
|
||||||
|
return ret == 6 ? 0 : -1;
|
||||||
|
}
|
||||||
|
|
||||||
int set_array_info(int mdfd, struct supertype *st, struct mdinfo *info)
|
int set_array_info(int mdfd, struct supertype *st, struct mdinfo *info)
|
||||||
{
|
{
|
||||||
/* Initialise kernel's knowledge of array.
|
/* Initialise kernel's knowledge of array.
|
||||||
|
|
Loading…
Reference in New Issue