1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00

Fix const warning in dev_manager_info() and _dev_manager_lv_rmnodes().

This commit is contained in:
Zdenek Kabelac 2010-08-03 13:13:01 +00:00
parent c10f7fd039
commit 3eadbbeb12
2 changed files with 6 additions and 5 deletions

View File

@ -1,6 +1,7 @@
Version 2.02.73 - Version 2.02.73 -
================================ ================================
Fix constness warning in archive_file structure from archive.c. Fix const warning in dev_manager_info() and _dev_manager_lv_rmnodes().
Fix const warning in archive_file structure from archive.c.
Clean generated files .exported_symbols_generated, example.conf for distclean. Clean generated files .exported_symbols_generated, example.conf for distclean.
Handle failure of all mirrored log devices and all but one mirror leg. Handle failure of all mirrored log devices and all but one mirror leg.
Disallow 'mirrored' log type for cluster mirrors. Disallow 'mirrored' log type for cluster mirrors.

View File

@ -220,7 +220,7 @@ int dev_manager_info(struct dm_pool *mem, const struct logical_volume *lv,
int with_open_count, int with_read_ahead, int with_open_count, int with_read_ahead,
struct dm_info *info, uint32_t *read_ahead) struct dm_info *info, uint32_t *read_ahead)
{ {
const char *dlid, *name; char *dlid, *name;
int r; int r;
if (!(name = build_dm_name(mem, lv->vg->name, lv->name, NULL))) { if (!(name = build_dm_name(mem, lv->vg->name, lv->name, NULL))) {
@ -236,7 +236,7 @@ int dev_manager_info(struct dm_pool *mem, const struct logical_volume *lv,
log_debug("Getting device info for %s [%s]", name, dlid); log_debug("Getting device info for %s [%s]", name, dlid);
r = _info(dlid, with_open_count, with_read_ahead, info, read_ahead); r = _info(dlid, with_open_count, with_read_ahead, info, read_ahead);
dm_pool_free(mem, (char*)name); dm_pool_free(mem, name);
return r; return r;
} }
@ -812,7 +812,7 @@ static int _dev_manager_lv_rmnodes(const struct logical_volume *lv)
int dev_manager_mknodes(const struct logical_volume *lv) int dev_manager_mknodes(const struct logical_volume *lv)
{ {
struct dm_info dminfo; struct dm_info dminfo;
const char *name; char *name;
int r = 0; int r = 0;
if (!(name = build_dm_name(lv->vg->cmd->mem, lv->vg->name, lv->name, NULL))) if (!(name = build_dm_name(lv->vg->cmd->mem, lv->vg->name, lv->name, NULL)))
@ -826,7 +826,7 @@ int dev_manager_mknodes(const struct logical_volume *lv)
r = _dev_manager_lv_rmnodes(lv); r = _dev_manager_lv_rmnodes(lv);
} }
dm_pool_free(lv->vg->cmd->mem, (char*)name); dm_pool_free(lv->vg->cmd->mem, name);
return r; return r;
} }