leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: lustre: lmv: release locks if lmv_intent_lock() fails

Browse Source 
In lmv_intent_lock() if we will return an error then first release any
locks referenced by the intent.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5431
Reviewed-on: http://review.whamcloud.com/11319
Reviewed-by: wang di <di.wang@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John L. Hammond 2016-09-18 16:37:13 -04:00 committed by Greg Kroah-Hartman
parent 60deafeae4
commit 620f086d9a
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/lustre/lustre/lmv/lmv_intent.c
View File

@ -533,5 +533,27 @@ int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
extra_lock_flags);
else
LBUG();
if (rc < 0) {
struct lustre_handle lock_handle;
if (it->it_lock_mode) {
lock_handle.cookie = it->it_lock_handle;
ldlm_lock_decref(&lock_handle, it->it_lock_mode);
}
it->it_lock_handle = 0;
it->it_lock_mode = 0;
if (it->it_remote_lock_mode) {
lock_handle.cookie = it->it_remote_lock_handle;
ldlm_lock_decref(&lock_handle,
it->it_remote_lock_mode);
}
it->it_remote_lock_handle = 0;
it->it_remote_lock_mode = 0;
}
return rc;
}