Thin: Make 'lv_is_on_pv(s)' work with thin types

The pool metadata LV must be accounted for when determining what PVs
are in a thin-pool.  The pool LV must also be accounted for when
checking thin volumes.

This is a prerequisite for pvmove working with thin types.

1 files changed, 23 insertions, 1 deletions

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index ef64d1209..d2830b2a2 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -86,10 +86,18 @@ struct lv_names {
  * (or its metadata device) is on the PV, 1 would be returned for the
  * top-level LV.
  * If you wish to check the images themselves, you should pass them.
+ * Currently handles:
+ *  - linear
+ *  - stripe
+ *  - RAID
+ *  - mirror
+ *  - thin-pool
+ *  - thin
  *
  * FIXME:  This should be made more generic, possibly use 'for_each_sub_lv'.
  * 'for_each_sub_lv' does not yet allow us to short-circuit execution or
- * pass back the values we need yet though...
+ * pass back the values we need yet though (i.e. it only allows success or
+ * error - not true or false).
  *
  * Returns: 1 if LV (or part of LV) is on PV, 0 otherwise
  */
@@ -110,6 +118,20 @@ int lv_is_on_pv(struct logical_volume *lv, struct physical_volume *pv)
 	if (lv_is_on_pv(seg->log_lv, pv))
 		return 1;
 
+	/* Check thin-pool metadata area */
+	if (lv_is_on_pv(seg->metadata_lv, pv))
+		return 1;
+
+	/* Check thin volume's pool LV */
+	if (lv_is_on_pv(seg->pool_lv, pv))
+		return 1;
+
+	/*
+	 * Do _not_ check 'external_lv.  We wouldn't count an origin's
+	 * PVs as part of a snapshot, so we don't count external_origin's
+	 * PVs as part of a thin-snap/LV
+	 */
+
 	/* Check stack of LVs */
 	dm_list_iterate_items(seg, &lv->segments) {
 		for (s = 0; s < seg->area_count; s++) {