From bba8cc5a5491dcf1eec1efaa33a366056b47fd86 Mon Sep 17 00:00:00 2001 From: kanoi Date: Sat, 17 Jan 2015 13:20:41 +1100 Subject: [PATCH] ckdb - workmarkers has 2 trees, fix so both are always updated --- src/ckdb.h | 2 +- src/ckdb_dbio.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ckdb.h b/src/ckdb.h index d243a037..731607a5 100644 --- a/src/ckdb.h +++ b/src/ckdb.h @@ -52,7 +52,7 @@ #define DB_VLOCK "1" #define DB_VERSION "0.9.6" -#define CKDB_VERSION DB_VERSION"-0.836" +#define CKDB_VERSION DB_VERSION"-0.837" #define WHERE_FFL " - from %s %s() line %d" #define WHERE_FFL_HERE __FILE__, __func__, __LINE__ diff --git a/src/ckdb_dbio.c b/src/ckdb_dbio.c index 0a903aad..f2b194cb 100644 --- a/src/ckdb_dbio.c +++ b/src/ckdb_dbio.c @@ -5978,15 +5978,24 @@ unparam: workmarkers_root = remove_from_ktree(workmarkers_root, old_wm_item, cmp_workmarkers); + workmarkers_workinfoid_root = remove_from_ktree(workmarkers_workinfoid_root, + old_wm_item, + cmp_workmarkers_workinfoid); copy_tv(&(oldworkmarkers->expirydate), cd); workmarkers_root = add_to_ktree(workmarkers_root, old_wm_item, cmp_workmarkers); + workmarkers_workinfoid_root = add_to_ktree(workmarkers_workinfoid_root, + old_wm_item, + cmp_workmarkers_workinfoid); } if (wm_item) { workmarkers_root = add_to_ktree(workmarkers_root, wm_item, cmp_workmarkers); + workmarkers_workinfoid_root = add_to_ktree(workmarkers_workinfoid_root, + wm_item, + cmp_workmarkers_workinfoid); k_add_head(workmarkers_store, wm_item); } }