Append _TO_LVSEG to names of internal A_CONTIGUOUS and A_CLING flags.

Remove some unnecesary prev_lvseg checks.

diff --git a/WHATS_NEW b/WHATS_NEW
index 0cf2418a7d8d8971dc69e0fcec1c0a9e0295e600..6ee8eef4a93f5dd29e7ece83cec64fa95e65b4a9 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.96 - 
 ================================
+  Append _TO_LVSEG to names of internal A_CONTIGUOUS and A_CLING flags.
   Add missing pkg init --with-systemdsystemunitdir in configure.in (2.02.92).
   Fix division by zero if PV with zero PE count is used during vgcfgrestore.
   Add initial support for thin pool lvconvert.

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 83eab4965290a80f885deb6d2b7245ed32f6de03..adc5e896e955c72b2f788bfc63f265728250694c 100644 (file)
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -39,10 +39,12 @@ typedef enum {
 #define RAID_METADATA_AREA_LEN 1
 
 /* FIXME These ended up getting used differently from first intended.  Refactor. */
-#define A_CONTIGUOUS           0x01
-#define A_CLING                        0x02
-#define A_CLING_BY_TAGS                0x04
-#define A_CLING_TO_ALLOCED     0x08    /* Only for ALLOC_NORMAL */
+/* Only one of A_CONTIGUOUS_TO_LVSEG, A_CLING_TO_LVSEG, A_CLING_TO_ALLOCED may be set */
+#define A_CONTIGUOUS_TO_LVSEG  0x01    /* Must be contiguous to an existing segment */
+#define A_CLING_TO_LVSEG       0x02    /* Must use same disks as existing LV segment */
+#define A_CLING_TO_ALLOCED     0x04    /* Must use same disks as already-allocated segment */
+
+#define A_CLING_BY_TAGS                0x08    /* Must match tags against existing segment */
 #define A_CAN_SPLIT            0x10
 
 /*
@@ -907,11 +909,11 @@ static void _init_alloc_parms(struct alloc_handle *ah, struct alloc_parms *alloc
        /* Are there any preceding segments we must follow on from? */
        if (alloc_parms->prev_lvseg) {
                if (alloc_parms->alloc == ALLOC_CONTIGUOUS)
-                       alloc_parms->flags |= A_CONTIGUOUS;
+                       alloc_parms->flags |= A_CONTIGUOUS_TO_LVSEG;
                else if (alloc_parms->alloc == ALLOC_CLING)
-                       alloc_parms->flags |= A_CLING;
+                       alloc_parms->flags |= A_CLING_TO_LVSEG;
                else if (alloc_parms->alloc == ALLOC_CLING_BY_TAGS) {
-                       alloc_parms->flags |= A_CLING;
+                       alloc_parms->flags |= A_CLING_TO_LVSEG;
                        alloc_parms->flags |= A_CLING_BY_TAGS;
                }
        }
@@ -1494,14 +1496,14 @@ static area_use_t _check_pva(struct alloc_handle *ah, struct pv_area *pva, uint3
                                return NEXT_AREA;
 
        /* If maximise_cling is set, perform several checks, otherwise perform exactly one. */
-       if (!iteration_count && !log_iteration_count && alloc_parms->flags & (A_CONTIGUOUS | A_CLING | A_CLING_TO_ALLOCED)) {
+       if (!iteration_count && !log_iteration_count && alloc_parms->flags & (A_CONTIGUOUS_TO_LVSEG | A_CLING_TO_LVSEG | A_CLING_TO_ALLOCED)) {
                /* Contiguous? */
-               if (((alloc_parms->flags & A_CONTIGUOUS) || ah->maximise_cling) &&
-                   alloc_parms->prev_lvseg && _check_contiguous(ah->cmd, alloc_parms->prev_lvseg, pva, alloc_state))
+               if (((alloc_parms->flags & A_CONTIGUOUS_TO_LVSEG) || (ah->maximise_cling && alloc_parms->prev_lvseg)) &&
+                   _check_contiguous(ah->cmd, alloc_parms->prev_lvseg, pva, alloc_state))
                        return PREFERRED;
        
                /* Try next area on same PV if looking for contiguous space */
-               if (alloc_parms->flags & A_CONTIGUOUS)
+               if (alloc_parms->flags & A_CONTIGUOUS_TO_LVSEG)
                        return NEXT_AREA;
        
                /* Cling_to_alloced? */
@@ -1667,7 +1669,7 @@ static int _find_some_parallel_space(struct alloc_handle *ah, const struct alloc
        uint32_t devices_needed = ah->area_count + ah->parity_count;
 
        /* ix_offset holds the number of parallel allocations that must be contiguous/cling */
-       if (alloc_parms->flags & (A_CONTIGUOUS | A_CLING) && alloc_parms->prev_lvseg)
+       if (alloc_parms->flags & (A_CONTIGUOUS_TO_LVSEG | A_CLING_TO_LVSEG))
                ix_offset = _stripes_per_mimage(alloc_parms->prev_lvseg) * alloc_parms->prev_lvseg->area_count;
 
        if (alloc_parms->flags & A_CLING_TO_ALLOCED)