[lvm-devel] master - config: fix timestamp comparison during merge
Peter Rajnoha
prajnoha at fedoraproject.org
Thu Jul 4 12:51:47 UTC 2013
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1cb66fe16e0bc180a0be8e18d8b361b5b5842128
Commit: 1cb66fe16e0bc180a0be8e18d8b361b5b5842128
Parent: a0ce432829d71da0c03647e249f4742cc98cea74
Author: Peter Rajnoha <prajnoha at redhat.com>
AuthorDate: Thu Jul 4 14:51:37 2013 +0200
Committer: Peter Rajnoha <prajnoha at redhat.com>
CommitterDate: Thu Jul 4 14:51:37 2013 +0200
config: fix timestamp comparison during merge
---
lib/config/config.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/config/config.c b/lib/config/config.c
index 2994111..61e92cf 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -1055,7 +1055,7 @@ int merge_config_tree(struct cmd_context *cmd, struct dm_config_tree *cft,
* whether the .cache isn't older then any of configs
*/
cs = dm_config_get_custom(cft);
- csn = dm_config_get_custom(cft);
+ csn = dm_config_get_custom(newdata);
if (cs && csn && (cs->timestamp < csn->timestamp))
cs->timestamp = csn->timestamp;
More information about the lvm-devel
mailing list