Fix compilation with disabled devmapper

During release preparation things has changed, so making sure
we are compilable with --disable-devmapper.

diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 59fafcb7635157b9b48d5f78c5640cb4c1cbc2ce..bb3b240d21c2e1ea093ed9a28b8ed078cfe705d3 100644 (file)
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -147,7 +147,7 @@ int target_present(struct cmd_context *cmd, const char *target_name,
 {
        return 0;
 }
-int lvm_dm_prefix_check(const char *sysfs_dir, int major, int minor, const char *prefix)
+int lvm_dm_prefix_check(int major, int minor, const char *prefix)
 {
        return 0;
 }
@@ -161,6 +161,11 @@ int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s, int use_layer,
 {
        return 0;
 }
+int lv_check_not_in_use(struct cmd_context *cmd __attribute__((unused)),
+                       struct logical_volume *lv, struct lvinfo *info)
+{
+        return 0;
+}
 int lv_snapshot_percent(const struct logical_volume *lv, percent_t *percent)
 {
        return 0;
@@ -170,6 +175,25 @@ int lv_mirror_percent(struct cmd_context *cmd, const struct logical_volume *lv,
 {
        return 0;
 }
+int lv_raid_percent(const struct logical_volume *lv, percent_t *percent)
+{
+       return 0;
+}
+int lv_thin_pool_percent(const struct logical_volume *lv, int metadata,
+                        percent_t *percent)
+{
+       return 0;
+}
+int lv_thin_percent(const struct logical_volume *lv, int mapped,
+                   percent_t *percent)
+{
+       return 0;
+}
+int lv_thin_pool_transaction_id(const struct logical_volume *lv,
+                               uint64_t *transaction_id)
+{
+       return 0;
+}
 int lvs_in_vg_activated(struct volume_group *vg)
 {
        return 0;
@@ -184,7 +208,7 @@ int lv_suspend(struct cmd_context *cmd, const char *lvid_s)
        return 1;
 }
 *******/
-int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s, unsigned origin_only)
+int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s, unsigned origin_only, unsigned exclusive)
 {
        return 1;
 }
@@ -260,10 +284,30 @@ int lv_check_transient(struct logical_volume *lv)
        return 1;
 }
 int monitor_dev_for_events(struct cmd_context *cmd, struct logical_volume *lv,
-                          struct lv_activate_opts *laopts, int monitor)
+                          const struct lv_activate_opts *laopts, int monitor)
 {
        return 1;
 }
+/* fs.c */
+void fs_unlock(void)
+{
+}
+/* dev_manager.c */
+int add_areas_line(struct dev_manager *dm, struct lv_segment *seg,
+                  struct dm_tree_node *node, uint32_t start_area,
+                  uint32_t areas)
+{
+        return 0;
+}
+int device_is_usable(struct device *dev)
+{
+        return 0;
+}
+int lv_has_target_type(struct dm_pool *mem, struct logical_volume *lv,
+                      const char *layer, const char *target_type)
+{
+        return 0;
+}
 #else                          /* DEVMAPPER_SUPPORT */
 
 static int _activation = 1;

diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c
index ba410f4c1e4714a729292a796c0e437c312707d2..4f723432b8622155d6557e7afec7a24a8f669989 100644 (file)
--- a/lib/mm/memlock.c
+++ b/lib/mm/memlock.c
@@ -38,12 +38,12 @@ void memlock_dec_daemon(struct cmd_context *cmd)
        return;
 }
 
-void critical_section_inc(struct cmd_context *cmd)
+void critical_section_inc(struct cmd_context *cmd, const char *reason)
 {
        return;
 }
 
-void critical_section_dec(struct cmd_context *cmd)
+void critical_section_dec(struct cmd_context *cmd, const char *reason)
 {
        return;
 }