v2_02_114 annotated tag has been created
by Alasdair Kergon
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=95ae8022ff3433...
Commit: 95ae8022ff34337ff81d1e9829a970108bc19622
Parent: 0000000000000000000000000000000000000000
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: 2014-11-28 23:06 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: 2014-11-28 23:06 +0000
annotated tag: v2_02_114 has been created
at 95ae8022ff34337ff81d1e9829a970108bc19622 (tag)
tagging e492861749195311cc71910aaacb084110a9ddbb (commit)
replaces v2_02_113
Release 2.02.114.
19 files changed, 154 insertions(+), 36 deletions(-)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAlR5AA4ACgkQIoGRwVZ+LBdbZACgpGyyHYDWMHIE7PswYHIssKZH
rdgAoLGvssqqpq/R8evtl78ExaX2MvqZ
=7bcm
-----END PGP SIGNATURE-----
Alasdair G Kergon (3):
post-release
libdaemon: Fix some client leaks.
pre-release
Peter Rajnoha (5):
pvresize: fix size in 'Resizing to ...' verbose message to show proper result size
initscripts: fix typo in clvmd initscript causing CLVMD_STOP_TIMEOUT variable to be ignored
coverity: remove dead code in lv_info_with_seg_status
coverity: fix possible NULL dereference
coverity: remove dead code in lv_info_with_seg_status (continued)
Petr Rockai (4):
toollib: Fix uninitialised config value type in get_cachepolicy_params.
metadata: Add cache_policy to lvcreate_params and honour it.
lvcreate: Implement --cachepolicy/--cachesettings.
Update WHATS_NEW.
Zdenek Kabelac (3):
thin: add missing 64KB rounding
makefiles: avoid regeneration of Makefile
toollib: fix regression in parsing /dev/mapper/vg-lv
8 years, 10 months
master - post-release
by Alasdair Kergon
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9258e57a50451f...
Commit: 9258e57a50451fbbabd72a197e6a78a2a5d898db
Parent: e492861749195311cc71910aaacb084110a9ddbb
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Fri Nov 28 23:07:31 2014 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Fri Nov 28 23:07:31 2014 +0000
post-release
---
VERSION | 2 +-
VERSION_DM | 2 +-
WHATS_NEW | 3 +++
WHATS_NEW_DM | 3 +++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/VERSION b/VERSION
index 851b30d..539cce1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.114(2)-git (2014-11-28)
+2.02.115(2)-git (2014-11-28)
diff --git a/VERSION_DM b/VERSION_DM
index b4b6b50..e38dae6 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.92-git (2014-11-28)
+1.02.93-git (2014-11-28)
diff --git a/WHATS_NEW b/WHATS_NEW
index a23f766..645450c 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,3 +1,6 @@
+Version 2.02.115 -
+=====================================
+
Version 2.02.114 - 28th November 2014
=====================================
Release socket in daemon_close and protocol string in daemon_open error path.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 45d3ece..8d1f648 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,3 +1,6 @@
+Version 1.02.93 -
+====================================
+
Version 1.02.92 - 24th November 2014
====================================
Fix memory corruption with sorting empty string lists (1.02.86).
8 years, 10 months
master - pre-release
by Alasdair Kergon
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e4928617491953...
Commit: e492861749195311cc71910aaacb084110a9ddbb
Parent: 6521c4b2156597a36a986def85449be734336c72
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Fri Nov 28 23:06:07 2014 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Fri Nov 28 23:06:07 2014 +0000
pre-release
---
VERSION | 2 +-
VERSION_DM | 2 +-
WHATS_NEW | 6 +++---
WHATS_NEW_DM | 3 ---
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/VERSION b/VERSION
index 0f1a69f..851b30d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.114(2)-git (2014-11-24)
+2.02.114(2)-git (2014-11-28)
diff --git a/VERSION_DM b/VERSION_DM
index 13ce0a0..b4b6b50 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.93-git (2014-11-24)
+1.02.92-git (2014-11-28)
diff --git a/WHATS_NEW b/WHATS_NEW
index b1cce84..a23f766 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,10 +1,10 @@
-Version 2.02.114 -
+Version 2.02.114 - 28th November 2014
=====================================
- Release socket in daemon_close and protocol string in a daemon_open error path.
+ Release socket in daemon_close and protocol string in daemon_open error path.
Add --cachepolicy and --cachesettings to lvcreate.
Fix regression when parsing /dev/mapper dir (2.02.112).
Fix missing rounding to 64KB when estimating optimal thin pool chunk size.
- Fix typo in clvmd initscript causing CLVMD_STOP_TIMEOUT variable to be ignored.
+ Fix typo in clvmd initscript causing CLVMD_STOP_TIMEOUT var to be ignored.
Fix size in pvresize "Resizing to ..." verbose msg to show proper result size.
Version 2.02.113 - 24th November 2014
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 6eafed6..45d3ece 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,6 +1,3 @@
-Version 1.02.93 -
-====================================
-
Version 1.02.92 - 24th November 2014
====================================
Fix memory corruption with sorting empty string lists (1.02.86).
8 years, 10 months
master - libdaemon: Fix some client leaks.
by Alasdair Kergon
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6521c4b2156597...
Commit: 6521c4b2156597a36a986def85449be734336c72
Parent: 530ebd8976bc08fdbaac7c132301fdde1e66ed8f
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Fri Nov 28 21:31:51 2014 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Fri Nov 28 21:31:51 2014 +0000
libdaemon: Fix some client leaks.
Free (and clear) h.protocol string on daemon_open() error paths
so it's OK for caller to skip calling daemon_close() if returned
h.socket_fd is -1.
Close h.socket_fd in daemon_close() to avoid possible leak.
https://bugzilla.redhat.com/1164234
---
WHATS_NEW | 1 +
daemons/lvmetad/testclient.c | 4 +++-
libdaemon/client/daemon-client.c | 30 +++++++++++++++++++++++-------
libdaemon/client/daemon-client.h | 7 ++++---
4 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 89f0ebb..b1cce84 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.114 -
=====================================
+ Release socket in daemon_close and protocol string in a daemon_open error path.
Add --cachepolicy and --cachesettings to lvcreate.
Fix regression when parsing /dev/mapper dir (2.02.112).
Fix missing rounding to 64KB when estimating optimal thin pool chunk size.
diff --git a/daemons/lvmetad/testclient.c b/daemons/lvmetad/testclient.c
index c4cf7c5..8ea068d 100644
--- a/daemons/lvmetad/testclient.c
+++ b/daemons/lvmetad/testclient.c
@@ -105,6 +105,7 @@ void _dump_vg(daemon_handle h, const char *uuid)
int main(int argc, char **argv) {
daemon_handle h = lvmetad_open();
+ /* FIXME Missing error path */
if (argc > 1) {
int i;
@@ -114,6 +115,7 @@ int main(int argc, char **argv) {
scan(h, argv[i]);
}
destroy_toolcontext(cmd);
+ /* FIXME Missing lvmetad_close() */
return 0;
}
@@ -122,6 +124,6 @@ int main(int argc, char **argv) {
_dump_vg(h, vgid);
_pv_add(h, uuid3, NULL);
- daemon_close(h);
+ daemon_close(h); /* FIXME lvmetad_close? */
return 0;
}
diff --git a/libdaemon/client/daemon-client.c b/libdaemon/client/daemon-client.c
index d0b8951..d37b966 100644
--- a/libdaemon/client/daemon-client.c
+++ b/libdaemon/client/daemon-client.c
@@ -26,7 +26,11 @@
daemon_handle daemon_open(daemon_info i)
{
- daemon_handle h = { .protocol_version = 0, .error = 0 };
+ daemon_handle h = {
+ .protocol = NULL,
+ .protocol_version = 0,
+ .error = 0
+ };
daemon_reply r = { 0 };
struct sockaddr_un sockaddr = { .sun_family = AF_UNIX };
@@ -79,12 +83,16 @@ daemon_handle daemon_open(daemon_info i)
return h;
error:
- if (h.socket_fd >= 0)
- if (close(h.socket_fd))
- log_sys_error("close", "daemon_open");
+ if (h.socket_fd >= 0 && close(h.socket_fd))
+ log_sys_error("close", "daemon_open");
+ h.socket_fd = -1;
+
if (r.cft)
daemon_reply_destroy(r);
- h.socket_fd = -1;
+
+ dm_free((char *)h.protocol);
+ h.protocol = NULL;
+
return h;
}
@@ -118,7 +126,8 @@ daemon_reply daemon_send(daemon_handle h, daemon_request rq)
return reply;
}
-void daemon_reply_destroy(daemon_reply r) {
+void daemon_reply_destroy(daemon_reply r)
+{
if (r.cft)
dm_config_destroy(r.cft);
buffer_destroy(&r.buffer);
@@ -160,6 +169,12 @@ daemon_reply daemon_send_simple(daemon_handle h, const char *id, ...)
void daemon_close(daemon_handle h)
{
+ if (h.socket_fd >= 0) {
+ log_debug("Closing daemon socket (fd %d).", h.socket_fd);
+ if (close(h.socket_fd))
+ log_sys_error("close", "daemon_close");
+ }
+
dm_free((char *)h.protocol);
}
@@ -210,7 +225,8 @@ int daemon_request_extend(daemon_request r, ...)
return res;
}
-void daemon_request_destroy(daemon_request r) {
+void daemon_request_destroy(daemon_request r)
+{
if (r.cft)
dm_config_destroy(r.cft);
buffer_destroy(&r.buffer);
diff --git a/libdaemon/client/daemon-client.h b/libdaemon/client/daemon-client.h
index ae3be91..e1445c1 100644
--- a/libdaemon/client/daemon-client.h
+++ b/libdaemon/client/daemon-client.h
@@ -97,15 +97,16 @@ void daemon_request_destroy(daemon_request r);
void daemon_reply_destroy(daemon_reply r);
-static inline int64_t daemon_reply_int(daemon_reply r, const char *path, int64_t def) {
+static inline int64_t daemon_reply_int(daemon_reply r, const char *path, int64_t def)
+{
return dm_config_find_int64(r.cft->root, path, def);
}
-static inline const char *daemon_reply_str(daemon_reply r, const char *path, const char *def) {
+static inline const char *daemon_reply_str(daemon_reply r, const char *path, const char *def)
+{
return dm_config_find_str_allow_empty(r.cft->root, path, def);
}
-
/* Shut down the communication to the daemon. Compulsory. */
void daemon_close(daemon_handle h);
8 years, 10 months
master - Update WHATS_NEW.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=530ebd8976bc08...
Commit: 530ebd8976bc08fdbaac7c132301fdde1e66ed8f
Parent: 5b2726fc6142c734e06fa8b49ad856b2e47da9fc
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Thu Nov 27 20:23:57 2014 +0100
Committer: Petr Rockai <prockai(a)redhat.com>
CommitterDate: Thu Nov 27 20:23:57 2014 +0100
Update WHATS_NEW.
---
WHATS_NEW | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index d90cd94..89f0ebb 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.114 -
=====================================
+ Add --cachepolicy and --cachesettings to lvcreate.
Fix regression when parsing /dev/mapper dir (2.02.112).
Fix missing rounding to 64KB when estimating optimal thin pool chunk size.
Fix typo in clvmd initscript causing CLVMD_STOP_TIMEOUT variable to be ignored.
8 years, 10 months
master - lvcreate: Implement --cachepolicy/--cachesettings.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5b2726fc6142c7...
Commit: 5b2726fc6142c734e06fa8b49ad856b2e47da9fc
Parent: 2c3db52356eebd7ad7e950a01f465359c040b379
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Thu Nov 27 20:21:41 2014 +0100
Committer: Petr Rockai <prockai(a)redhat.com>
CommitterDate: Thu Nov 27 20:22:03 2014 +0100
lvcreate: Implement --cachepolicy/--cachesettings.
---
test/shell/lvcreate-cache.sh | 14 ++++++++++++++
tools/commands.h | 3 ++-
tools/lvcreate.c | 19 ++++++++++++++++++-
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/test/shell/lvcreate-cache.sh b/test/shell/lvcreate-cache.sh
index eeba827..f709d8b 100644
--- a/test/shell/lvcreate-cache.sh
+++ b/test/shell/lvcreate-cache.sh
@@ -226,6 +226,20 @@ fail lvcreate -H -L10 --chunksize 16M $vg/cpool4
lvremove -f $vg
+lvcreate --type cache-pool -L10 $vg/cpool
+lvcreate --type cache -l 1 --cachepool $vg/cpool -n corigin $vg --cachepolicy mq --cachesettings migration_threshold=233
+dmsetup status | grep $vg
+dmsetup status | grep $vg-corigin | grep 'migration_threshold 233'
+
+lvremove -f $vg
+
+lvcreate --type cache-pool -L10 --cachepolicy mq --cachesettings migration_threshold=233 $vg/cpool
+lvcreate --type cache -l 1 --cachepool $vg/cpool -n corigin $vg
+dmsetup status | grep $vg
+dmsetup status | grep $vg-corigin | grep 'migration_threshold 233'
+
+lvremove -f $vg
+
##############################
# Test things that should fail
diff --git a/tools/commands.h b/tools/commands.h
index 852b675..8dc335c 100644
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -308,6 +308,7 @@ xx(lvcreate,
"\t[-A|--autobackup {y|n}]\n"
"\t[--addtag Tag]\n"
"\t[--alloc AllocationPolicy]\n"
+ "\t[--cachepolicy Policy] [--cachesettings Key=Value]\n"
"\t[-c|--chunksize]\n"
"\t[-C|--contiguous {y|n}]\n"
"\t[--commandprofile ProfileName]\n"
@@ -337,7 +338,7 @@ xx(lvcreate,
"\t[PhysicalVolumePath...]\n\n",
addtag_ARG, alloc_ARG, autobackup_ARG, activate_ARG, available_ARG,
- cache_ARG, cachemode_ARG, cachepool_ARG,
+ cache_ARG, cachemode_ARG, cachepool_ARG, cachepolicy_ARG, cachesettings_ARG,
chunksize_ARG, contiguous_ARG, corelog_ARG, discards_ARG,
extents_ARG, ignoreactivationskip_ARG, ignoremonitoring_ARG, major_ARG,
metadataprofile_ARG, minor_ARG, mirrorlog_ARG, mirrors_ARG, monitor_ARG,
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index b0186d3..7236ffc 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -698,7 +698,9 @@ static int _lvcreate_params(struct cmd_context *cmd,
#define CACHE_POOL_ARGS \
cachemode_ARG,\
- cachepool_ARG
+ cachepool_ARG,\
+ cachepolicy_ARG,\
+ cachesettings_ARG
#define MIRROR_ARGS \
corelog_ARG,\
@@ -1010,6 +1012,13 @@ static int _lvcreate_params(struct cmd_context *cmd,
return 0;
}
+ if ((arg_count(cmd, cachepolicy_ARG) || arg_count(cmd, cachesettings_ARG)) &&
+ !(lp->cache_policy = get_cachepolicy_params(cmd)))
+ {
+ log_error("Failed to parse cache policy and/or settings.");
+ return 0;
+ }
+
dm_list_iterate_items(current_group, &cmd->arg_value_groups) {
if (!grouped_arg_is_set(current_group->arg_values, addtag_ARG))
continue;
@@ -1404,6 +1413,13 @@ static int _validate_internal_thin_processing(const struct lvcreate_params *lp)
return r;
}
+static void _destroy_lvcreate_params(struct lvcreate_params *lp)
+{
+ if (lp->cache_policy)
+ dm_config_destroy(lp->cache_policy);
+ lp->cache_policy = NULL;
+}
+
int lvcreate(struct cmd_context *cmd, int argc, char **argv)
{
int r = ECMD_FAILED;
@@ -1482,6 +1498,7 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv)
r = ECMD_PROCESSED;
out:
+ _destroy_lvcreate_params(&lp);
unlock_and_release_vg(cmd, vg, lp.vg_name);
return r;
}
8 years, 10 months
master - metadata: Add cache_policy to lvcreate_params and honour it.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2c3db52356eebd...
Commit: 2c3db52356eebd7ad7e950a01f465359c040b379
Parent: 92908541638b41215d48e51d6fa4aa63b82d8c1a
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Thu Nov 27 20:20:48 2014 +0100
Committer: Petr Rockai <prockai(a)redhat.com>
CommitterDate: Thu Nov 27 20:20:48 2014 +0100
metadata: Add cache_policy to lvcreate_params and honour it.
---
lib/metadata/lv_manip.c | 11 +++++++++++
lib/metadata/metadata-exported.h | 1 +
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 879cd51..b00e11b 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -7143,6 +7143,13 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
}
}
+ if (lv_is_cache_pool(lv) && !origin_lv) {
+ if (lp->cache_policy && !lv_cache_setpolicy(lv, lp->cache_policy))
+ return NULL; /* revert? */
+ if (!lv_update_and_reload(lv))
+ return NULL; /* FIXME: revert */
+ }
+
if (seg_is_cache(lp) || (origin_lv && lv_is_cache_pool(lv))) {
/* Finish cache conversion magic */
if (origin_lv) {
@@ -7161,6 +7168,10 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
}
}
lv = tmp_lv;
+
+ if (lp->cache_policy && !lv_cache_setpolicy(lv, lp->cache_policy))
+ return NULL; /* revert? */
+
if (!lv_update_and_reload(lv)) {
/* FIXME Do a better revert */
log_error("Aborting. Manual intervention required.");
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index d960e1f..d70602d 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -854,6 +854,7 @@ struct lvcreate_params {
uint32_t max_recovery_rate; /* RAID */
uint64_t feature_flags; /* cache */
+ struct dm_config_tree *cache_policy; /* cache */
const struct segment_type *segtype; /* all */
unsigned target_attr; /* all */
8 years, 10 months
master - toollib: Fix uninitialised config value type in get_cachepolicy_params.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=92908541638b41...
Commit: 92908541638b41215d48e51d6fa4aa63b82d8c1a
Parent: 4bfdb01f789a50267cbb50288a3bd5bc60edd685
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Thu Nov 27 20:19:28 2014 +0100
Committer: Petr Rockai <prockai(a)redhat.com>
CommitterDate: Thu Nov 27 20:19:28 2014 +0100
toollib: Fix uninitialised config value type in get_cachepolicy_params.
---
tools/toollib.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tools/toollib.c b/tools/toollib.c
index 6d409a9..41e6f88 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -1166,6 +1166,7 @@ struct dm_config_tree *get_cachepolicy_params(struct cmd_context *cmd)
if (!(cn->v = dm_config_create_value(result)))
goto_out;
+ cn->v->type = DM_CFG_STRING;
cn->v->v.str = arg_str_value(cmd, cachepolicy_ARG, NULL);
}
8 years, 10 months
master - toollib: fix regression in parsing /dev/mapper/vg-lv
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4bfdb01f789a50...
Commit: 4bfdb01f789a50267cbb50288a3bd5bc60edd685
Parent: c8890e3ac1adcb9129c30d3fe9a1a11ceedebce4
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Nov 26 17:09:47 2014 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Nov 26 17:29:35 2014 +0100
toollib: fix regression in parsing /dev/mapper/vg-lv
Commit b0dde9e8f026ddd679 introduced regression in parsing
/dev/mapper prefix - and tried to check for '/' one char behind.
---
WHATS_NEW | 1 +
test/shell/listings.sh | 5 +++++
tools/toollib.c | 4 ++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index bd7b7f9..d90cd94 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.114 -
=====================================
+ Fix regression when parsing /dev/mapper dir (2.02.112).
Fix missing rounding to 64KB when estimating optimal thin pool chunk size.
Fix typo in clvmd initscript causing CLVMD_STOP_TIMEOUT variable to be ignored.
Fix size in pvresize "Resizing to ..." verbose msg to show proper result size.
diff --git a/test/shell/listings.sh b/test/shell/listings.sh
index fbd4af7..fcf6308 100644
--- a/test/shell/listings.sh
+++ b/test/shell/listings.sh
@@ -68,6 +68,11 @@ test $(lvs --noheadings $vg | wc -l) -eq 2
test $(lvs -a --noheadings $vg | wc -l) -eq 6
dmsetup ls | grep "$PREFIX" | grep -v "LVMTEST.*pv."
+# Check we parse /dev/mapper/vg-lv
+lvdisplay "$DM_DEV_DIR/mapper/$vg-$lv3"
+# Check we parse /dev/vg/lv
+lvdisplay "$DM_DEV_DIR/$vg/$lv3"
+
lvcreate -l2 -s $vg/$lv3
lvcreate -l1 -s -n inval $vg/$lv3
lvcreate -l4 -I4 -i2 -n stripe $vg
diff --git a/tools/toollib.c b/tools/toollib.c
index 71eb9a8..6d409a9 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -130,8 +130,8 @@ const char *skip_dev_dir(struct cmd_context *cmd, const char *vg_name,
vg_name++;
/* Reformat string if /dev/mapper found */
- if (!strncmp(vg_name, dmdir, dmdir_len) && vg_name[dmdir_len + 1] == '/') {
- vg_name += devdir_len + 1;
+ if (!strncmp(vg_name, dmdir, dmdir_len) && vg_name[dmdir_len] == '/') {
+ vg_name += dmdir_len + 1;
while (*vg_name == '/')
vg_name++;
8 years, 10 months
master - coverity: remove dead code in lv_info_with_seg_status (continued)
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c8890e3ac1adcb...
Commit: c8890e3ac1adcb9129c30d3fe9a1a11ceedebce4
Parent: 193f9b26a0a87b2f5ce9a308ea0d957fadfe4aeb
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Wed Nov 26 11:58:25 2014 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Wed Nov 26 11:58:25 2014 +0100
coverity: remove dead code in lv_info_with_seg_status (continued)
---
lib/activate/activate.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 258873b..dd0a4f9 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -722,11 +722,9 @@ int lv_info_with_seg_status(struct cmd_context *cmd, const struct logical_volume
if (!activation())
return 0;
- if (lv == lv_seg->lv) {
- r = _lv_info(cmd, lv, use_layer, lvinfo, lv_seg, lv_seg_status,
- with_open_count, with_read_ahead);
- return 0;
- }
+ if (lv == lv_seg->lv)
+ return _lv_info(cmd, lv, use_layer, lvinfo, lv_seg, lv_seg_status,
+ with_open_count, with_read_ahead);
/*
* If the info is requested for an LV and segment
8 years, 10 months