Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove subarray detection from load_super. 

Nothing relies on this any more, so remove it.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2010-11-22 20:24:50 +11:00
parent a951a4f78f
commit e32bd33f44
6 changed files with 0 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
super-ddf.c
View File

@ -777,8 +777,6 @@ static int load_super_ddf(struct supertype *st, int fd,
if (load_super_ddf_all(st, fd, &st->sb, devname, 1) == 0)
return 0;
#endif
if (st->subarray[0])
return 1; /* FIXME Is this correct */
if (get_dev_size(fd, devname, &dsize) == 0)
return 1;
@ -844,26 +842,6 @@ static int load_super_ddf(struct supertype *st, int fd,
return rv;
}
if (st->subarray[0]) {
unsigned long val;
struct vcl *v;
char *ep;
val = strtoul(st->subarray, &ep, 10);
if (*ep != '\0') {
free(super);
return 1;
}
for (v = super->conflist; v; v = v->next)
if (v->vcnum == val)
super->currentconf = v;
if (!super->currentconf) {
free(super);
return 1;
}
}
/* Should possibly check the sections .... */
st->sb = super;
@ -2892,25 +2870,6 @@ static int load_super_ddf_all(struct supertype *st, int fd,
if (rv)
return 1;
}
if (st->subarray[0]) {
unsigned long val;
struct vcl *v;
char *ep;
val = strtoul(st->subarray, &ep, 10);
if (*ep != '\0') {
free(super);
return 1;
}
for (v = super->conflist; v; v = v->next)
if (v->vcnum == val)
super->currentconf = v;
if (!super->currentconf) {
free(super);
return 1;
}
}
*sbp = super;
if (st->ss == NULL) {

3
super-gpt.c
View File

@ -76,9 +76,6 @@ static int load_gpt(struct supertype *st, int fd, char *devname)
free_gpt(st);
if (st->subarray[0])
return 1;
if (posix_memalign((void**)&super, 512, 32*512) != 0) {
fprintf(stderr, Name ": %s could not allocate superblock\n",
__func__);

37
super-intel.c
View File

@ -2852,25 +2852,6 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
err = 2;
goto error;
}
if (st->subarray[0]) {
unsigned long val;
char *ep;
err = 1;
val = strtoul(st->subarray, &ep, 10);
if (*ep != '\0') {
free_imsm(super);
goto error;
}
if (val < super->anchor->num_raid_devs)
super->current_vol = val;
else {
free_imsm(super);
goto error;
}
}
err = 0;
error:
@ -2933,24 +2914,6 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
return rv;
}
if (st->subarray[0]) {
unsigned long val;
char *ep;
val = strtoul(st->subarray, &ep, 10);
if (*ep != '\0') {
free_imsm(super);
return 1;
}
if (val < super->anchor->num_raid_devs)
super->current_vol = val;
else {
free_imsm(super);
return 1;
}
}
st->sb = super;
if (st->ss == NULL) {
st->ss = &super_imsm;

3
super-mbr.c
View File

@ -80,9 +80,6 @@ static int load_super_mbr(struct supertype *st, int fd, char *devname)
free_mbr(st);
if (st->subarray[0])
return 1;
if (posix_memalign((void**)&super, 512, 512) != 0) {
fprintf(stderr, Name ": %s could not allocate superblock\n",
__func__);

3
super0.c
View File

@ -820,9 +820,6 @@ static int load_super0(struct supertype *st, int fd, char *devname)
free_super0(st);
if (st->subarray[0])
return 1;
if (!get_dev_size(fd, devname, &dsize))
return 1;

3
super1.c
View File

@ -1217,9 +1217,6 @@ static int load_super1(struct supertype *st, int fd, char *devname)
free_super1(st);
if (st->subarray[0])
return 1;
if (st->ss == NULL || st->minor_version == -1) {
int bestvers = -1;
struct supertype tst;