diff options
Diffstat (limited to 'xlators/features/leases')
| -rw-r--r-- | xlators/features/leases/src/leases.c | 18 | ||||
| -rw-r--r-- | xlators/features/leases/src/leases.h | 1 |
2 files changed, 6 insertions, 13 deletions
diff --git a/xlators/features/leases/src/leases.c b/xlators/features/leases/src/leases.c index 3e0460000d7..faffa0e71f8 100644 --- a/xlators/features/leases/src/leases.c +++ b/xlators/features/leases/src/leases.c @@ -957,19 +957,11 @@ leases_init_priv (xlator_t *this) GF_ASSERT (priv); if (!priv->timer_wheel) { - if (!glusterfs_global_timer_wheel (this)) { - gf_msg_debug (this->name, 0, "Initing the global " - "timer wheel"); - ret = glusterfs_global_timer_wheel_init (this->ctx); - if (ret) { - gf_msg (this->name, GF_LOG_ERROR, 0, - LEASE_MSG_NO_TIMER_WHEEL, - "Initing the global timer " - "wheel failed"); - goto out; - } + priv->timer_wheel = glusterfs_ctx_tw_get (this->ctx); + if (!priv->timer_wheel) { + ret = -1; + goto out; } - priv->timer_wheel = glusterfs_global_timer_wheel (this); } if (!priv->inited_recall_thr) { @@ -1076,6 +1068,8 @@ fini (xlator_t *this) GF_FREE (priv); + glusterfs_ctx_tw_put (this->ctx); + return 0; } diff --git a/xlators/features/leases/src/leases.h b/xlators/features/leases/src/leases.h index 703c4d809cd..443c6a22324 100644 --- a/xlators/features/leases/src/leases.h +++ b/xlators/features/leases/src/leases.h @@ -26,7 +26,6 @@ #include "lkowner.h" #include "locking.h" #include "upcall-utils.h" -#include "tw.h" #include "timer-wheel.h" #include "leases-mem-types.h" #include "leases-messages.h" |