Add segment parameter to target_present functions.

diff --git a/WHATS_NEW b/WHATS_NEW
index 892afb71803193f62476ae99b1830da01f09a074..bcad2992c15726e7cbeab1e88443cf03cfa1d459 100644 (file)
--- 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 50275dde2a9bbcb4f663884a3c0e769fc5f60ee9..911f6eb7f2f559099621b9bc8b757a2ac759620e 100644 (file)
--- 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 00e938947b01082d7d23b0ad40def067be14be38..9d115bee3352ca94bc09b16632322ae2641650fa 100644 (file)
--- 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 498a2472b663290b7a581caa4dbf8ea8d7810d78..a4b9361a024558c5149d55b618913b2d19441418 100644 (file)
--- 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 f12673d996a602ecc9f77305c688b65bd2867152..3d3985cb2ab4581cfe1a83ca3cda76dc3dd543f7 100644 (file)
--- 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 503977c48d6f04df74a21f08279376f4b3cd02ae..fde6a8a372d3f7d5817fec8d125838c5704b3827 100644 (file)
--- 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 ded88f21b20998950773d07d4ec45eac04a390b9..2dad6dc7ea7ebd4c358cc1032b64b4015741f523 100644 (file)
--- 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 2b83c77ab3d05a48bf5edb33c04f97a561a2b382..9831f428602e0275230af273d6fb26d48ab6bfae 100644 (file)
--- 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 943ca26910d4d4f3681ccf7dabe8eb64ee5fd9b5..603cd240b9bd09e4d81db5a69484b18cf73cce26 100644 (file)
--- 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 a09fa77e5726a5f002a76db61f211e254fafbb08..ae6e5ad7d8f45e0736012f2d7d49fcef9515347c 100644 (file)
--- 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 6f9ca8449111330bb839e7be9e5e6c16eeb3447f..eb60b5551d3483af129c39c56808cb8f9bf19c80 100644 (file)
--- 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;