summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Buisson <sebastien.buisson@bull.net>2013-07-24 17:17:26 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-24 17:29:19 (GMT)
commitf84d3d4735a1c96a745c453de8390936a7eb72d3 (patch)
treea59299f45eeffa2549d38e6a256079b587b27d41
parent8a48df7080b2fa0aed2b8df74437a39217c1eb8c (diff)
downloadlinux-f84d3d4735a1c96a745c453de8390936a7eb72d3.tar.xz
staging/lustre: fix 'data race condition' issues in at_reset()
Fix 'data race condition' defects found by Coverity version 6.5.0: Data race condition (MISSING_LOCK) Accessing variable without holding lock. Elsewhere, this variable is accessed with lock held. at_reset() needs to take at->at_lock before modifying its members. Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2744 Lustre-change: http://review.whamcloud.com/6569 Signed-off-by: Sebastien Buisson <sebastien.buisson@bull.net> Reviewed-by: Bob Glossman <bob.glossman@intel.com> Reviewed-by: Keith Mannthey <keith.mannthey@intel.com> Reviewed-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: Peng Tao <tao.peng@emc.com> Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/include/lustre_import.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre_import.h b/drivers/staging/lustre/lustre/include/lustre_import.h
index 3a5dd6a..67259eb 100644
--- a/drivers/staging/lustre/lustre/include/lustre_import.h
+++ b/drivers/staging/lustre/lustre/include/lustre_import.h
@@ -336,9 +336,11 @@ static inline unsigned int at_timeout2est(unsigned int val)
}
static inline void at_reset(struct adaptive_timeout *at, int val) {
+ spin_lock(&at->at_lock);
at->at_current = val;
at->at_worst_ever = val;
at->at_worst_time = cfs_time_current_sec();
+ spin_unlock(&at->at_lock);
}
static inline void at_init(struct adaptive_timeout *at, int val, int flags) {
memset(at, 0, sizeof(*at));