Incremental: Remove redundant call for GET_ARRAY_INFO

The code above just called md_get_array_info() and only reached this
point if it returned an error that isn't ENODEV, so it's pointless to
check this again here.

In addition it was incorrectly retrieving ioctl data into a
mdu_bitmap_file_t instead of mdu_array_info_t.

Fixes: ("8382f19 Add new mode: --incremental")
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>

diff --git a/Incremental.c b/Incremental.c
index 1f12c774e57645ba1bdb54cbfcc1c7120d7b9d57..802e5255d3389c74f00aef55a00c549ee31db926 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -1345,7 +1345,6 @@ int IncrementalScan(struct context *c, char *devnm)
 restart:
        for (me = mapl ; me ; me = me->next) {
                mdu_array_info_t array;
-               mdu_bitmap_file_t bmf;
                struct mdinfo *sra;
                int mdfd;
 
@@ -1405,13 +1404,12 @@ restart:
                         * is a hint only
                         */
                        int added = -1;
-                       if (ioctl(mdfd, GET_ARRAY_INFO, &bmf) < 0) {
-                               int bmfd = open(mddev->bitmap_file, O_RDWR);
-                               if (bmfd >= 0) {
-                                       added = ioctl(mdfd, SET_BITMAP_FILE,
-                                                     bmfd);
-                                       close(bmfd);
-                               }
+                       int bmfd;
+
+                       bmfd = open(mddev->bitmap_file, O_RDWR);
+                       if (bmfd >= 0) {
+                               added = ioctl(mdfd, SET_BITMAP_FILE, bmfd);
+                               close(bmfd);
                        }
                        if (c->verbose >= 0) {
                                if (added == 0)