shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-22 06:50:52 +03:00
Code Releases Activity

active: fix compilation without devmapper

Browse Source 
Better support for compilation without device-mapper.
This commit is contained in:
Zdenek Kabelac 2020-09-28 18:56:58 +02:00
parent 0a82573416
commit 7d6dfe9019
4 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/activate/activate.c
View File

@ -186,8 +186,8 @@ void set_activation(int act, int silent)
if (warned || !act)
return;
log_error("Compiled without libdevmapper support. "
"Can't enable activation.");
log_warn("WARNING: Compiled without libdevmapper support. "
"Can't enable activation.");
warned = 1;
}
@ -222,23 +222,13 @@ int lv_info(struct cmd_context *cmd, const struct logical_volume *lv, int use_la
{
return 0;
}
int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s, int use_layer,
struct lvinfo *info, int with_open_count, int with_read_ahead)
{
return 0;
}
int lv_info_with_seg_status(struct cmd_context *cmd, const struct logical_volume *lv,
const struct lv_segment *lv_seg, int use_layer,
int lv_info_with_seg_status(struct cmd_context *cmd,
const struct lv_segment *lv_seg,
struct lv_with_info_and_seg_status *status,
int with_open_count, int with_read_ahead)
{
return 0;
}
int lv_status(struct cmd_context *cmd, const struct lv_segment *lv_seg,
int use_layer, struct lv_seg_status *lv_seg_status)
{
return 0;
}
int lv_cache_status(const struct logical_volume *cache_lv,
struct lv_status_cache **status)
{
@ -285,6 +275,10 @@ int lv_raid_message(const struct logical_volume *lv, const char *msg)
{
return 0;
}
int lv_writecache_message(const struct logical_volume *lv, const char *msg)
{
return 0;
}
int lv_thin_pool_status(const struct logical_volume *lv, int flush,
struct lv_status_thin_pool **thin_pool_status)
{

8
lib/metadata/lv_manip.c
View File

@ -7559,10 +7559,10 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
return NULL;
}
/* Does LV need to be zeroed? */
if (lp->zero && !seg_is_thin(lp)) {
log_error("Can't wipe start of new LV without using "
"device-mapper kernel driver.");
return NULL;
if (lp->zero) {
log_warn("WARNING: Skipping zeroing and wipping, compiled without activation support.");
lp->zero = 0;
lp->wipe_signatures = 0;
}
}

6
lib/metadata/thin_manip.c
View File

@ -544,9 +544,9 @@ int update_pool_lv(struct logical_volume *lv, int activate)
return_0;
}
if (!lv_is_active(lv)) {
init_dmeventd_monitor(monitored);
log_error("Cannot activate thin pool %s, perhaps skipped in lvm.conf volume_list?",
display_lvname(lv));
(void) init_dmeventd_monitor(monitored);
log_error("Cannot activate thin pool %s%s", display_lvname(lv),
activation() ? ", perhaps skipped in lvm.conf volume_list?" : ".");
return 0;
}
} else

34
lib/raid/raid.c
View File

@ -24,10 +24,6 @@
#include "metadata.h"
#include "lv_alloc.h"
static int _raid_target_present(struct cmd_context *cmd,
const struct lv_segment *seg __attribute__((unused)),
unsigned *attributes);
static void _raid_display(const struct lv_segment *seg)
{
unsigned s;
@ -239,6 +235,22 @@ static int _raid_text_export(const struct lv_segment *seg, struct formatter *f)
return _raid_text_export_raid(seg, f);
}
static int _raid_target_status_compatible(const char *type)
{
return (strstr(type, "raid") != NULL);
}
static void _raid_destroy(struct segment_type *segtype)
{
dm_free((void *) segtype->dso);
dm_free(segtype);
}
#ifdef DEVMAPPER_SUPPORT
static int _raid_target_present(struct cmd_context *cmd,
const struct lv_segment *seg __attribute__((unused)),
unsigned *attributes);
static int _raid_add_target_line(struct dev_manager *dm __attribute__((unused)),
struct dm_pool *mem __attribute__((unused)),
struct cmd_context *cmd __attribute__((unused)),
@ -356,18 +368,6 @@ static int _raid_add_target_line(struct dev_manager *dm __attribute__((unused)),
return add_areas_line(dm, seg, node, 0u, seg->area_count);
}
static int _raid_target_status_compatible(const char *type)
{
return (strstr(type, "raid") != NULL);
}
static void _raid_destroy(struct segment_type *segtype)
{
dm_free((void *) segtype->dso);
dm_free(segtype);
}
#ifdef DEVMAPPER_SUPPORT
static int _raid_target_percent(void **target_state,
dm_percent_t *percent,
struct dm_pool *mem,
@ -568,9 +568,9 @@ static struct segtype_handler _raid_ops = {
.text_import_area_count = _raid_text_import_area_count,
.text_import = _raid_text_import,
.text_export = _raid_text_export,
.add_target_line = _raid_add_target_line,
.target_status_compatible = _raid_target_status_compatible,
#ifdef DEVMAPPER_SUPPORT
.add_target_line = _raid_add_target_line,
.target_percent = _raid_target_percent,
.target_present = _raid_target_present,
.check_transient_status = _raid_transient_status,