From 98f68cf115a30a101d3be2252ecbe1391720ed88 Mon Sep 17 00:00:00 2001 From: Yaniv Kaul Date: Sat, 13 Oct 2018 00:56:42 +0300 Subject: Multiple xlators: perform gettimeofday() not under lock While it may slightly reduce accuracy, I think it's better to acquire the time outside a lock and then memcpy the value while under lock. Compile-tested only! updates: bz#1193929 Signed-off-by: Yaniv Kaul Change-Id: Ic8fb94a56c4fa2d3b13e59767e13646fb39342ba --- xlators/features/locks/src/inodelk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/features/locks/src/inodelk.c') diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index eff58a79569..b8e005038d8 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -145,11 +145,11 @@ __stale_inodelk(xlator_t *this, pl_inode_lock_t *candidate_lock, struct timeval curr; priv = this->private; - gettimeofday(&curr, NULL); /* Question: Should we just prune them all given the * chance? Or just the locks we are attempting to acquire? */ if (inodelk_conflict(candidate_lock, requested_lock)) { + gettimeofday(&curr, NULL); *lock_age_sec = curr.tv_sec - candidate_lock->granted_time.tv_sec; if (*lock_age_sec > priv->revocation_secs) return _gf_true; @@ -403,12 +403,12 @@ __lock_blocked_add(xlator_t *this, pl_dom_list_t *dom, pl_inode_lock_t *lock, { struct timeval now; - gettimeofday(&now, NULL); - if (can_block == 0) { goto out; } + gettimeofday(&now, NULL); + lock->blkd_time = now; list_add_tail(&lock->blocked_locks, &dom->blocked_inodelks); -- cgit