diff options
Diffstat (limited to 'daemons/lvmetad/lvmetad-core.c')
-rw-r--r-- | daemons/lvmetad/lvmetad-core.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c index ffa1c2867..e7b80c113 100644 --- a/daemons/lvmetad/lvmetad-core.c +++ b/daemons/lvmetad/lvmetad-core.c @@ -26,9 +26,6 @@ #include <stdint.h> #include <unistd.h> -#include <math.h> /* fabs() */ -#include <float.h> /* DBL_EPSILON */ - #define LVMETAD_SOCKET DEFAULT_RUN_DIR "/lvmetad.socket" struct vg_info { @@ -552,60 +549,6 @@ bad: return reply_fail("out of memory"); } -/* Test if the doubles are close enough to be considered equal */ -static int close_enough(double d1, double d2) -{ - return fabs(d1 - d2) < DBL_EPSILON; -} - -static int compare_value(struct dm_config_value *a, struct dm_config_value *b) -{ - int r = 0; - - if (a->type > b->type) - return 1; - if (a->type < b->type) - return -1; - - switch (a->type) { - case DM_CFG_STRING: r = strcmp(a->v.str, b->v.str); break; - case DM_CFG_FLOAT: r = close_enough(a->v.f, b->v.f) ? 0 : (a->v.f > b->v.f) ? 1 : -1; break; - case DM_CFG_INT: r = (a->v.i == b->v.i) ? 0 : (a->v.i > b->v.i) ? 1 : -1; break; - case DM_CFG_EMPTY_ARRAY: return 0; - } - - if (r == 0 && a->next && b->next) - r = compare_value(a->next, b->next); - return r; -} - -static int compare_config(struct dm_config_node *a, struct dm_config_node *b) -{ - int result = 0; - if (a->v && b->v) - result = compare_value(a->v, b->v); - if (a->v && !b->v) - result = 1; - if (!a->v && b->v) - result = -1; - if (a->child && b->child) - result = compare_config(a->child, b->child); - - if (result) { - // DEBUGLOG("config inequality at %s / %s", a->key, b->key); - return result; - } - - if (a->sib && b->sib) - result = compare_config(a->sib, b->sib); - if (a->sib && !b->sib) - result = 1; - if (!a->sib && b->sib) - result = -1; - - return result; -} - static int vg_remove_if_missing(lvmetad_state *s, const char *vgid, int update_pvids); /* You need to be holding the pvid_to_vgid lock already to call this. */ |