From 067d42a65344cf5daeae062bce879a9cd4f6e8ab Mon Sep 17 00:00:00 2001 From: Zhang HongChao Date: Mon, 24 Jan 2011 13:53:25 +0100 Subject: [PATCH] b=23352 modified value of at_min is not taken into account i=Johann i=Eri Mei --- lustre/ChangeLog | 4 ++++ lustre/include/lustre_import.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 5744be9..4e74ea2 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -77,6 +77,10 @@ Bugzilla : 23988 Description: kernel BUG at drivers/scsi/sd.c Details : Remove sd iostats patch from sles11 patch series. +Severity : normal +Bugzilla : 23352 +Description: Modified value of at_min is not taken into account + ------------------------------------------------------------------------------- 2010-10-29 Oracle, Inc. diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h index e5c71dc..2a67f87 100644 --- a/lustre/include/lustre_import.h +++ b/lustre/include/lustre_import.h @@ -212,8 +212,9 @@ static inline void at_init(struct adaptive_timeout *at, int val, int flags) { at->at_flags = flags; 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