Incremental: Fix a merge error in recent patch

commit  81219e70f2a9be7292046860ea15528fe5854cab required
merging and I messed it up.
The locking shouldn't be there - the caller locks now.

Reported-by: "Labun, Marcin" <Marcin.Labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/Incremental.c b/Incremental.c
index c2a89c0b8c75dc5857b8484488739ec5b9f9840a..3596739192d67533fb9384584495170a2838b34e 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -1404,9 +1404,6 @@ static int Incremental_container(struct supertype *st, char *devname,
        /* when nothing to activate - quit */
        if (list == NULL)
                return 0;
-       if (map_lock(&map))
-               fprintf(stderr, Name ": failed to get exclusive lock on "
-                       "mapfile\n");
        for (ra = list ; ra ; ra = ra->next) {
                int mdfd;
                char chosen_name[1024];
@@ -1501,10 +1498,8 @@ static int Incremental_container(struct supertype *st, char *devname,
 
        /* don't move spares to container with volume being activated
           when all volumes are blocked */
-       if (ra_all == ra_blocked) {
-               map_unlock(&map);
+       if (ra_all == ra_blocked)
                return 0;
-       }
 
        /* Now move all suitable spares from spare container */
        domains = domain_from_array(list, st->ss->name);