From 16f6533558685185eee78b7f74be03e0ece51005 Mon Sep 17 00:00:00 2001 From: ZhangHongChao Date: Tue, 31 Aug 2010 13:38:48 -0700 Subject: [PATCH] LU-13 updated patch to fix at_min issue Also Bugzilla bug 23352, attachment 31479 This is already landed for 1.8.6. Change-Id: I87db1f40401e1da9337eace5d3bd992bc64871a4 Signed-off-by: Christopher J. Morrone Reviewed-on: http://review.whamcloud.com/306 Tested-by: Hudson Reviewed-by: Oleg Drokin Reviewed-by: Mikhail Pershin --- lustre/include/lustre_import.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h index 0e93bcc..e956755 100644 --- a/lustre/include/lustre_import.h +++ b/lustre/include/lustre_import.h @@ -320,8 +320,9 @@ static inline void at_init(struct adaptive_timeout *at, int val, int flags) { at->at_flags = flags; cfs_spin_lock_init(&at->at_lock); } +extern unsigned int at_min; static inline int at_get(struct adaptive_timeout *at) { - return at->at_current; + return (at->at_current > at_min) ? at->at_current : at_min; } int at_measured(struct adaptive_timeout *at, unsigned int val); int import_at_get_index(struct obd_import *imp, int portal); -- 1.8.3.1