Resolve some more warnings

unused variables when MDASSEMBLE is defined, and a typo in mdadm.8

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/Assemble.c b/Assemble.c
index 74708d158e55d23736650ca81db770f676a6f5c8..fac2bad676c70c6dfe7871653f90cd98fad45d3f 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -220,7 +220,9 @@ int Assemble(struct supertype *st, char *mddev,
        int change = 0;
        int inargv = 0;
        int report_missmatch;
+#ifndef MDASSEMBLE
        int bitmap_done;
+#endif
        int start_partial_ok = (runstop >= 0) && 
                (force || devlist==NULL || auto_assem);
        unsigned int num_devs;
@@ -701,9 +703,9 @@ int Assemble(struct supertype *st, char *mddev,
                close(mdfd);
                return err;
        }
+       bitmap_done = 0;
 #endif
        /* Ok, no bad inconsistancy, we can try updating etc */
-       bitmap_done = 0;
        content->update_private = NULL;
        devices = malloc(num_devs * sizeof(*devices));
        devmap = calloc(num_devs * content->array.raid_disks, 1);

diff --git a/mdadm.8.in b/mdadm.8.in
index da6ff127b79a42d94be17f37bfbcf0a63fc28c51..929aff2d4e99ab979b6259f7090b7c9152ae65fd 100644 (file)
--- a/mdadm.8.in
+++ b/mdadm.8.in
@@ -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.
 Losing file system context would cause reshape to be broken.
 
-Reshape can be continued later using
-.B\-\-continue
-option for grow command.
+Reshape can be continued later using the
+.B \-\-continue
+option for the grow command.
 
 .SH For Manage mode:
 

diff --git a/super-intel.c b/super-intel.c
index 6b31ce3f81b55461a067c59a612837f8f76190ac..e8e21f42cb474281f36ce610add880cfb3d4a593 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -5900,7 +5900,10 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
                struct imsm_map *map;
                struct imsm_map *map2;
                struct mdinfo *this;
-               int slot, chunk;
+               int slot;
+#ifndef MDASSEMBLE
+               int chunk;
+#endif
                char *ep;
 
                if (subarray &&
@@ -5925,7 +5928,6 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
                 * OROM/EFI
                 */
 
-               chunk = __le16_to_cpu(map->blocks_per_strip) >> 1;
                this = malloc(sizeof(*this));
                if (!this) {
                        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);
                this->next = rest;
 #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 */
                if (!validate_geometry_imsm_orom(super,
                                                 get_imsm_raid_level(map), /* RAID level */