Resolve some more warnings
unused variables when MDASSEMBLE is defined, and a typo in mdadm.8 Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
b4ab44d8cd
commit
a648241517
|
@ -220,7 +220,9 @@ int Assemble(struct supertype *st, char *mddev,
|
||||||
int change = 0;
|
int change = 0;
|
||||||
int inargv = 0;
|
int inargv = 0;
|
||||||
int report_missmatch;
|
int report_missmatch;
|
||||||
|
#ifndef MDASSEMBLE
|
||||||
int bitmap_done;
|
int bitmap_done;
|
||||||
|
#endif
|
||||||
int start_partial_ok = (runstop >= 0) &&
|
int start_partial_ok = (runstop >= 0) &&
|
||||||
(force || devlist==NULL || auto_assem);
|
(force || devlist==NULL || auto_assem);
|
||||||
unsigned int num_devs;
|
unsigned int num_devs;
|
||||||
|
@ -701,9 +703,9 @@ int Assemble(struct supertype *st, char *mddev,
|
||||||
close(mdfd);
|
close(mdfd);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
bitmap_done = 0;
|
||||||
#endif
|
#endif
|
||||||
/* Ok, no bad inconsistancy, we can try updating etc */
|
/* Ok, no bad inconsistancy, we can try updating etc */
|
||||||
bitmap_done = 0;
|
|
||||||
content->update_private = NULL;
|
content->update_private = NULL;
|
||||||
devices = malloc(num_devs * sizeof(*devices));
|
devices = malloc(num_devs * sizeof(*devices));
|
||||||
devmap = calloc(num_devs * content->array.raid_disks, 1);
|
devmap = calloc(num_devs * content->array.raid_disks, 1);
|
||||||
|
|
|
@ -1129,9 +1129,9 @@ stops reshape after reshape critical section is being restored. This happens
|
||||||
before file system pivot operation and avoids loss of file system context.
|
before file system pivot operation and avoids loss of file system context.
|
||||||
Losing file system context would cause reshape to be broken.
|
Losing file system context would cause reshape to be broken.
|
||||||
|
|
||||||
Reshape can be continued later using
|
Reshape can be continued later using the
|
||||||
.B\-\-continue
|
.B \-\-continue
|
||||||
option for grow command.
|
option for the grow command.
|
||||||
|
|
||||||
.SH For Manage mode:
|
.SH For Manage mode:
|
||||||
|
|
||||||
|
|
|
@ -5900,7 +5900,10 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
|
||||||
struct imsm_map *map;
|
struct imsm_map *map;
|
||||||
struct imsm_map *map2;
|
struct imsm_map *map2;
|
||||||
struct mdinfo *this;
|
struct mdinfo *this;
|
||||||
int slot, chunk;
|
int slot;
|
||||||
|
#ifndef MDASSEMBLE
|
||||||
|
int chunk;
|
||||||
|
#endif
|
||||||
char *ep;
|
char *ep;
|
||||||
|
|
||||||
if (subarray &&
|
if (subarray &&
|
||||||
|
@ -5925,7 +5928,6 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
|
||||||
* OROM/EFI
|
* OROM/EFI
|
||||||
*/
|
*/
|
||||||
|
|
||||||
chunk = __le16_to_cpu(map->blocks_per_strip) >> 1;
|
|
||||||
this = malloc(sizeof(*this));
|
this = malloc(sizeof(*this));
|
||||||
if (!this) {
|
if (!this) {
|
||||||
fprintf(stderr, Name ": failed to allocate %zu bytes\n",
|
fprintf(stderr, Name ": failed to allocate %zu bytes\n",
|
||||||
|
@ -5937,6 +5939,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
|
||||||
getinfo_super_imsm_volume(st, this, NULL);
|
getinfo_super_imsm_volume(st, this, NULL);
|
||||||
this->next = rest;
|
this->next = rest;
|
||||||
#ifndef MDASSEMBLE
|
#ifndef MDASSEMBLE
|
||||||
|
chunk = __le16_to_cpu(map->blocks_per_strip) >> 1;
|
||||||
/* mdadm does not support all metadata features- set the bit in all arrays state */
|
/* mdadm does not support all metadata features- set the bit in all arrays state */
|
||||||
if (!validate_geometry_imsm_orom(super,
|
if (!validate_geometry_imsm_orom(super,
|
||||||
get_imsm_raid_level(map), /* RAID level */
|
get_imsm_raid_level(map), /* RAID level */
|
||||||
|
|
Loading…
Reference in New Issue