From: John L. Hammond <john.hamm...@intel.com>

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.hamm...@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.w...@intel.com>
Reviewed-by: Lai Siyao <lai.si...@intel.com>
Reviewed-by: Oleg Drokin <oleg.dro...@intel.com>
Signed-off-by: James Simmons <jsimm...@infradead.org>
---
 drivers/staging/lustre/lustre/lmv/lmv_intent.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/lustre/lustre/lmv/lmv_intent.c 
b/drivers/staging/lustre/lustre/lmv/lmv_intent.c
index 85cc5cb..fd3dc7c 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_intent.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_intent.c
@@ -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;
 }
-- 
1.7.1

Reply via email to