forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: lustre: ldlm: Fix a race during FLock handling

Browse source 
Protect against race where lock could have been just destroyed
due to overlap, in ldlm_process_flock_lock().
Easy reproducer is BULL's NFS Locktests in pthread mode.
(http://nfsv4.bullopensource.org/tools/tests/locktest.php)

Signed-off-by: Bruno Faccini <bruno.faccini@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1126
Reviewed-on: http://review.whamcloud.com/7134
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bruno Faccini 2016-04-12 16:14:03 -04:00 • committed by Greg Kroah-Hartman
parent 800548b1b1
commit 7e74e54f08
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
View file

@ -520,11 +520,6 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
granted: granted:
OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_CP_CB_WAIT, 10); OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_CP_CB_WAIT, 10);
if (lock->l_flags & LDLM_FL_DESTROYED) {
LDLM_DEBUG(lock, "client-side enqueue waking up: destroyed");
return 0;
}
if (lock->l_flags & LDLM_FL_FAILED) { if (lock->l_flags & LDLM_FL_FAILED) {
LDLM_DEBUG(lock, "client-side enqueue waking up: failed"); LDLM_DEBUG(lock, "client-side enqueue waking up: failed");
return -EIO; return -EIO;
@ -534,6 +529,16 @@ granted:
lock_res_and_lock(lock); lock_res_and_lock(lock);
/*
* Protect against race where lock could have been just destroyed
* due to overlap in ldlm_process_flock_lock().
*/
if (lock->l_flags & LDLM_FL_DESTROYED) {
unlock_res_and_lock(lock);
LDLM_DEBUG(lock, "client-side enqueue waking up: destroyed");
return 0;
}
/* ldlm_lock_enqueue() has already placed lock on the granted list. */ /* ldlm_lock_enqueue() has already placed lock on the granted list. */
list_del_init(&lock->l_res_link); list_del_init(&lock->l_res_link);