From 7c5ec126309518a3476fd637d332f27116b68fd3 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Wed, 18 Oct 2006 18:01:53 +0000
Subject: [PATCH] Add segment parameter to target_present functions.

---
 WHATS_NEW                  | 1 +
 lib/activate/dev_manager.c | 2 +-
 lib/error/errseg.c         | 2 +-
 lib/metadata/mirror.c      | 2 +-
 lib/metadata/segtype.h     | 2 +-
 lib/mirror/mirrored.c      | 2 +-
 lib/snapshot/snapshot.c    | 2 +-
 lib/striped/striped.c      | 2 +-
 lib/zero/zero.c            | 2 +-
 tools/lvconvert.c          | 2 +-
 tools/lvcreate.c           | 2 +-
 11 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index 892afb718..bcad2992c 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.13 -
 ===================================
+  Add segment parameter to target_present functions.
 
 Version 2.02.12 - 16th October 2006
 ===================================
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 50275dde2..911f6eb7f 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -785,7 +785,7 @@ static int _add_segment_to_dtree(struct dev_manager *dm,
 
 	/* Ensure required device-mapper targets are loaded */
 	if (seg->segtype->ops->target_present &&
-	    !seg->segtype->ops->target_present()) {
+	    !seg->segtype->ops->target_present(seg)) {
 		log_error("Can't expand LV %s: %s target support missing "
 			  "from kernel?", seg->lv->name, seg->segtype->name);
 		return 0;
diff --git a/lib/error/errseg.c b/lib/error/errseg.c
index 00e938947..9d115bee3 100644
--- a/lib/error/errseg.c
+++ b/lib/error/errseg.c
@@ -50,7 +50,7 @@ static int _errseg_add_target_line(struct dev_manager *dm __attribute((unused)),
 	return dm_tree_node_add_error_target(node, len);
 }
 
-static int _errseg_target_present(void)
+static int _errseg_target_present(const struct lv_segment *seg __attribute((unused)))
 {
 	static int _errseg_checked = 0;
 	static int _errseg_present = 0;
diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index 498a2472b..a4b9361a0 100644
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -562,7 +562,7 @@ int insert_pvmove_mirrors(struct cmd_context *cmd,
 	}
 
         if (activation() && segtype->ops->target_present &&
-            !segtype->ops->target_present()) {
+            !segtype->ops->target_present(NULL)) {
                 log_error("%s: Required device-mapper target(s) not "
                           "detected in your kernel", segtype->name);
                 return 0;
diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h
index f12673d99..3d3985cb2 100644
--- a/lib/metadata/segtype.h
+++ b/lib/metadata/segtype.h
@@ -76,7 +76,7 @@ struct segtype_handler {
 			       struct lv_segment *seg, char *params,
 			       uint64_t *total_numerator,
 			       uint64_t *total_denominator, float *percent);
-	int (*target_present) (void);
+	int (*target_present) (const struct lv_segment *seg);
 	int (*modules_needed) (struct dm_pool *mem,
 			       const struct lv_segment *seg,
 			       struct list *modules);
diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index 503977c48..fde6a8a37 100644
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -336,7 +336,7 @@ static int _mirrored_add_target_line(struct dev_manager *dm, struct dm_pool *mem
 	return add_areas_line(dm, seg, node, start_area, area_count);
 }
 
-static int _mirrored_target_present(void)
+static int _mirrored_target_present(const struct lv_segment *seg __attribute((unused)))
 {
 	static int _mirrored_checked = 0;
 	static int _mirrored_present = 0;
diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c
index ded88f21b..2dad6dc7e 100644
--- a/lib/snapshot/snapshot.c
+++ b/lib/snapshot/snapshot.c
@@ -112,7 +112,7 @@ static int _snap_target_percent(void **target_state __attribute((unused)),
 	return 1;
 }
 
-static int _snap_target_present(void)
+static int _snap_target_present(const struct lv_segment *seg __attribute((unused)))
 {
 	static int _snap_checked = 0;
 	static int _snap_present = 0;
diff --git a/lib/striped/striped.c b/lib/striped/striped.c
index 2b83c77ab..9831f4286 100644
--- a/lib/striped/striped.c
+++ b/lib/striped/striped.c
@@ -174,7 +174,7 @@ static int _striped_add_target_line(struct dev_manager *dm,
 	return add_areas_line(dm, seg, node, 0u, seg->area_count);
 }
 
-static int _striped_target_present(void)
+static int _striped_target_present(const struct lv_segment *seg __attribute((unused)))
 {
 	static int _striped_checked = 0;
 	static int _striped_present = 0;
diff --git a/lib/zero/zero.c b/lib/zero/zero.c
index 943ca2691..603cd240b 100644
--- a/lib/zero/zero.c
+++ b/lib/zero/zero.c
@@ -49,7 +49,7 @@ static int _zero_add_target_line(struct dev_manager *dm __attribute((unused)),
 	return dm_tree_node_add_zero_target(node, len);
 }
 
-static int _zero_target_present(void)
+static int _zero_target_present(const struct lv_segment *seg __attribute((unused)))
 {
 	static int _zero_checked = 0;
 	static int _zero_present = 0;
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index a09fa77e5..ae6e5ad7d 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -212,7 +212,7 @@ static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd,
 	}
 
 	if (activation() && lp->segtype->ops->target_present &&
-	    !lp->segtype->ops->target_present()) {
+	    !lp->segtype->ops->target_present(NULL)) {
 		log_error("%s: Required device-mapper target(s) not "
 			  "detected in your kernel", lp->segtype->name);
 		return 0;
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 6f9ca8449..eb60b5551 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -386,7 +386,7 @@ static int _lvcreate_params(struct lvcreate_params *lp, struct cmd_context *cmd,
 	}
 
 	if (activation() && lp->segtype->ops->target_present &&
-	    !lp->segtype->ops->target_present()) {
+	    !lp->segtype->ops->target_present(NULL)) {
 		log_error("%s: Required device-mapper target(s) not "
 			  "detected in your kernel", lp->segtype->name);
 		return 0;
-- 
2.43.5