Fix check for log-only allocation in new alloc normal loop.

diff --git a/WHATS_NEW b/WHATS_NEW
index c045e97f6f6bbb777d7b401bf77da3ca533eeb16..233fcc945058e41e9ea4b7f9ef3557e4d33e4ca6 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,7 +1,7 @@
 Version 2.02.85 - 
 ===================================
-  Extend normal policy to allow mirror logs on same devs as images if necessary.
-  Improve cling policy to recognise devs already allocated in the transaction.
+  Extend normal policy to allow mirror logs on same PVs as images if necessary.
+  Improve cling policy to recognise PVs already used during the transaction.
   Improve normal allocation algorithm to include clinging to existing areas.
   Add allocation/maximise_cling & mirror_logs_require_separate_pvs to lvm.conf.
   Fix metadata balance code to work with recent changes in metadata handling.

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 632f4b02234586595cf6292a9b851e2a59622a35..94374b96034ee9f9324bd8d31fbe6bc04eea9367 100644 (file)
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -1555,9 +1555,9 @@ static int _find_some_parallel_space(struct alloc_handle *ah, const struct alloc
                  (alloc_parms->flags & A_CLING_TO_ALLOCED) && !iteration_count++) ||
                /* Extra iteration needed to fill log areas on PVs already used? */
                 (alloc_parms->alloc == ALLOC_NORMAL && preferred_count == ix_offset && !ah->mirror_logs_separate &&
+                 (ix + preferred_count >= ah->area_count) && 
                  (ix + preferred_count < ah->area_count + alloc_state->log_area_count_still_needed) && !log_iteration_count++));
 
-
        if (preferred_count < ix_offset && !(alloc_parms->flags & A_CLING_TO_ALLOCED))
                return 1;