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

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>

diff --git a/drivers/staging/lustre/lustre/lmv/lmv_intent.c b/drivers/staging/lustre/lustre/lmv/lmv_intent.c
index 85cc5cb89dafab17f5b7a3107fa55a067be7ebae..fd3dc7cc68c4b20e269087c320bbe7b8d74f8e91 100644 (file)
--- 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;
 }