From a13947589e1593d6fae82ff0b5ce56c130bc7925 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Thu, 6 Jun 2013 14:38:03 +0200 Subject: [PATCH] LU-2744 build: fix 'data race condition' issues 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. Signed-off-by: Sebastien Buisson Change-Id: Ie23e735c630b45006e02f6dd04e682dabffb844f Reviewed-on: http://review.whamcloud.com/6571 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Fan Yong Reviewed-by: Keith Mannthey Reviewed-by: Oleg Drokin --- lustre/llite/llite_lib.c | 4 ++++ lustre/llite/namei.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 9a85d4d..1a98966 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -1213,7 +1213,9 @@ void ll_clear_inode(struct inode *inode) LASSERT(lli->lli_opendir_pid == 0); } + spin_lock(&lli->lli_lock); ll_i2info(inode)->lli_flags &= ~LLIF_MDS_SIZE_LOCK; + spin_unlock(&lli->lli_lock); md_null_inode(sbi->ll_md_exp, ll_inode2fid(inode)); LASSERT(!lli->lli_open_fd_write_count); @@ -1823,7 +1825,9 @@ void ll_update_inode(struct inode *inode, struct lustre_md *md) /* Use old size assignment to avoid * deadlock bz14138 & bz14326 */ i_size_write(inode, body->size); + spin_lock(&lli->lli_lock); lli->lli_flags |= LLIF_MDS_SIZE_LOCK; + spin_unlock(&lli->lli_lock); } ldlm_lock_decref(&lockh, mode); } diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c index 7383c7c..64855b1 100644 --- a/lustre/llite/namei.c +++ b/lustre/llite/namei.c @@ -275,8 +275,11 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, CDEBUG(D_INODE, "invaliding layout %d.\n", rc); } - if (bits & MDS_INODELOCK_UPDATE) + if (bits & MDS_INODELOCK_UPDATE) { + spin_lock(&lli->lli_lock); lli->lli_flags &= ~LLIF_MDS_SIZE_LOCK; + spin_unlock(&lli->lli_lock); + } if (S_ISDIR(inode->i_mode) && (bits & MDS_INODELOCK_UPDATE)) { -- 1.8.3.1