diff options
| author | NeilBrown <neilb@suse.com> | 2017-10-30 05:43:41 +0100 |
|---|---|---|
| committer | Jes Sorensen <jsorensen@fb.com> | 2017-11-01 22:26:37 +0100 |
| commit | 3bc6f786e1156d12ee466d732930bf71f6a8083a (patch) | |
| tree | 9bd6d1bb680d2f585928c95096b3196ac7e16673 /Incremental.c | |
| parent | systemd: add %I to description of mdadm-last-resort services. (diff) | |
| download | mdadm-3bc6f786e1156d12ee466d732930bf71f6a8083a.tar.xz mdadm-3bc6f786e1156d12ee466d732930bf71f6a8083a.zip | |
Incremental: Use ->validate_geometry instead of ->avail_size
Since mdadm 3.3 is has not been correct to call ->avail_size if
metadata hasn't been read from the device. ->validate_geometry
should be used instead.
Unfortunately array_try_spare() didn't get the memo, and it can crash
when adding a spare with no metdata.
So change it to use ->validate_geometry().
Only one place remains that uses ->avail_size(), and that is safe.
Also fix a comment with a typo.
Reported-and-tested-by: Bjørnar Ness <bjornar.ness@gmail.com>
Fixes: 641da7459192 ("super1: separate to version of _avail_space1().")
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Diffstat (limited to 'Incremental.c')
| -rw-r--r-- | Incremental.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Incremental.c b/Incremental.c index 91301eb5..0beab163 100644 --- a/Incremental.c +++ b/Incremental.c @@ -870,7 +870,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, struct supertype *st2; struct domainlist *dl = NULL; struct mdinfo *sra; - unsigned long long devsize; + unsigned long long devsize, freesize = 0; struct spare_criteria sc = {0, 0}; if (is_subarray(mp->metadata)) @@ -942,10 +942,13 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, close(mdfd); } if ((sra->component_size > 0 && - st2->ss->avail_size(st2, devsize, - sra->devs ? sra->devs->data_offset : - INVALID_SECTORS) < - sra->component_size) || + st2->ss->validate_geometry(st2, sra->array.level, sra->array.layout, + sra->array.raid_disks, &sra->array.chunk_size, + sra->component_size, + sra->devs ? sra->devs->data_offset : INVALID_SECTORS, + devname, &freesize, sra->consistency_policy, + 0) && + freesize < sra->component_size) || (sra->component_size == 0 && devsize < sc.min_size)) { if (verbose > 1) pr_err("not adding %s to %s as it is too small\n", @@ -1265,7 +1268,7 @@ static int try_spare(char *devname, int *dfdp, struct dev_policy *pol, * what arrays might be candidates. */ if (st) { - /* just try try 'array' or 'partition' based on this metadata */ + /* just try to add 'array' or 'partition' based on this metadata */ if (st->ss->add_to_super) return array_try_spare(devname, dfdp, pol, target, bare, st, verbose); |