mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-04 09:21:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: ldlm: Recalculate interval in ldlm_pool_recalc()

Browse Source 
Instead of rechecking a static value, recalculate to see if pool stats
need to be updated.
Add newline so message will print instead of warning about missing
newline.

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4536
Reviewed-on: http://review.whamcloud.com/12547
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nathaniel Clark
2016-09-18 16:38:27 -04:00
committed by Greg Kroah-Hartman
parent d333597a24
commit a5d604d763
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
View File

@@ -357,33 +357,39 @@ static int ldlm_pool_recalc(struct ldlm_pool *pl)
int count;
recalc_interval_sec = ktime_get_seconds() - pl->pl_recalc_time;
if (recalc_interval_sec <= 0)
goto recalc;
spin_lock(&pl->pl_lock);
if (recalc_interval_sec > 0) {
/*
* Update pool statistics every 1s.
*/
ldlm_pool_recalc_stats(pl);
spin_lock(&pl->pl_lock);
recalc_interval_sec = ktime_get_seconds() - pl->pl_recalc_time;
/*
* Zero out all rates and speed for the last period.
*/
atomic_set(&pl->pl_grant_rate, 0);
atomic_set(&pl->pl_cancel_rate, 0);
if (recalc_interval_sec > 0) {
/*
* Update pool statistics every 1s.
*/
ldlm_pool_recalc_stats(pl);
/*
* Zero out all rates and speed for the last period.
*/
atomic_set(&pl->pl_grant_rate, 0);
atomic_set(&pl->pl_cancel_rate, 0);
}
spin_unlock(&pl->pl_lock);
}
spin_unlock(&pl->pl_lock);
recalc:
if (pl->pl_ops->po_recalc) {
count = pl->pl_ops->po_recalc(pl);
lprocfs_counter_add(pl->pl_stats, LDLM_POOL_RECALC_STAT,
count);
}
recalc_interval_sec = pl->pl_recalc_time - ktime_get_seconds() +
pl->pl_recalc_period;
if (recalc_interval_sec <= 0) {
/* DEBUG: should be re-removed after LU-4536 is fixed */
CDEBUG(D_DLMTRACE, "%s: Negative interval(%ld), too short period(%ld)\n",
pl->pl_name, (long)recalc_interval_sec,
(long)pl->pl_recalc_period);
/* Prevent too frequent recalculation. */
recalc_interval_sec = 1;
}