Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1486057

[PATCH 014/124] staging: lustre: lmv: release locks if lmv_intent_lock() fails

Show all headers | View raw

From: John L. Hammond <john.hammond@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.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>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 000/124] missing patches from Lustre 2.7 release James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 014/124] staging: lustre: lmv: release locks if lmv_intent_lock() fails James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 039/124] staging: lustre: remove lustre_lite.h James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 007/124] staging: lustre: obd: add lnb_ prefix to members of struct niobuf_local James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 030/124] staging: lustre: llite: Replace write mutex with range lock James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
    Re: [PATCH 030/124] staging: lustre: llite: Replace write mutex with  range lock Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-09-19 09:30 +0200
      Re: [lustre-devel] [PATCH 030/124] staging: lustre: llite: Replace  write mutex with range lock "Dilger, Andreas" <andreas.dilger@intel.com> - 2016-09-19 11:30 +0200
        Re: [lustre-devel] [PATCH 030/124] staging: lustre: llite: Replace  write mutex with range lock Jan Kara <jack@suse.cz> - 2016-09-19 12:00 +0200
  [PATCH 016/124] staging: lustre: fix comparison between signed and unsigned James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 041/124] staging: lustre: llite: don't call make_bad_inode() on an old inode James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 043/124] staging: lustre: lmv: change type of lmv_obd->tgts_size to u32 James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 022/124] staging: lustre: llog: add newly opened llog at tail of handle list James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 010/124] staging: lustre: llite: add LL_LEASE_{RD,WR,UN}LCK James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 035/124] staging: lustre: llite: style cleanup for ll_mkdir James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 054/124] staging: lustre: llite: Add ioctl to get parent fids from link EA. James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 020/124] staging: lustre: lmv: release request in lmv_revalidate_slaves() James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  [PATCH 044/124] staging: lustre: misc: Reduce exposure to overflow on page counters. James Simmons <jsimmons@infradead.org> - 2016-09-18 23:10 +0200
  Re: [PATCH 000/124] missing patches from Lustre 2.7 release Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-09-19 10:20 +0200

csiph-web