diff options
author | NeilBrown <neilb@suse.de> | 2011-03-24 12:00:55 +1100 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2011-03-24 12:00:55 +1100 |
commit | 51d9a2ce33a6a60a75751a46bb93bf052a2dfc7a (patch) | |
tree | 6f6afb83f9466acdab298de5ea276ac6475ef543 /Manage.c | |
parent | b4add146a02286102916a815f2ed0ba3f76cfd7b (diff) | |
parent | 945f0fcd0179210ae5b72006c3621a73cc6e9205 (diff) |
Merge branch 'master' into devel-3.2
Conflicts:
Incremental.c
Manage.c
ReadMe.c
inventory
mdadm.8.in
mdadm.spec
mdassemble.8
mdmon.8
Diffstat (limited to 'Manage.c')
-rw-r--r-- | Manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -301,7 +301,7 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet) * which blocks STOP_ARRAY is probably a transient use, * so it is reasonable to retry for a while - 5 seconds. */ - count = 25; + count = 25; err = 0; while (count && fd >= 0 && (err = ioctl(fd, STOP_ARRAY, NULL)) < 0 && errno == EBUSY) { |