diff options
author | NeilBrown <neilb@suse.de> | 2011-04-27 09:58:49 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2011-04-27 09:58:49 +1000 |
commit | 7e90264df5060cd308ce56206ec7dfa29e2aa041 (patch) | |
tree | 31ed9c4017ae7e01a3c0014a84fa5400a27ced58 /mdadm.c | |
parent | 384e9be1330c29b40559f85dd0e6124bd0dfa535 (diff) |
Finally remove auto-home-host
This was #if-ed out for 3.0, but it really should go.
Gcc 4.6.0 complains that auto_update_home is set but not used
(which is true).
Reported-by: Tobias Powalowski <t.powa@gmx.de>
Diffstat (limited to 'mdadm.c')
-rw-r--r-- | mdadm.c | 35 |
1 files changed, 0 insertions, 35 deletions
@@ -103,7 +103,6 @@ int main(int argc, char *argv[]) char *shortopt = short_options; int dosyslog = 0; int rebuild_map = 0; - int auto_update_home = 0; char *subarray = NULL; char *remove_path = NULL; char *udev_filename = NULL; @@ -365,11 +364,6 @@ int main(int argc, char *argv[]) chunk /= 2; continue; -#if 0 - case O(ASSEMBLE,AutoHomeHost): - auto_update_home = 1; - continue; -#endif case O(INCREMENTAL, 'e'): case O(CREATE,'e'): case O(ASSEMBLE,'e'): @@ -1325,38 +1319,9 @@ int main(int argc, char *argv[]) cnt++; acnt++; } - if (rv2 == 1) - /* found something so even though assembly failed we - * want to avoid auto-updates - */ - auto_update_home = 0; } while (rv2!=2); /* Incase there are stacked devices, we need to go around again */ } while (acnt); -#if 0 - if (cnt == 0 && auto_update_home && homehost) { - /* Nothing found, maybe we need to bootstrap homehost info */ - do { - acnt = 0; - do { - rv2 = Assemble( - ss, NULL, - &ident, - NULL, NULL, 0, - readonly, runstop, - "homehost", - homehost, - require_homehost, - verbose-quiet, force); - if (rv2==0) { - cnt++; - acnt++; - } - } while (rv2!=2); - /* Incase there are stacked devices, we need to go around again */ - } while (acnt); - } -#endif if (cnt == 0 && rv == 0) { fprintf(stderr, Name ": No arrays found in config file or automatically\n"); rv = 1; |