From: John L. Hammond <john.hammond@intel.com>
Date: Thu, 3 Jul 2014 16:00:11 +0000 (-0500)
Subject: LU-5289 mdc: cleanup intent if mdc_finish_enqueue() fails
X-Git-Tag: 2.6.0-RC1~17
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=79165939172df8c608dd2cb134da1ef7911aaf4b

LU-5289 mdc: cleanup intent if mdc_finish_enqueue() fails

In mdc_enqueue() clear the lock handle, lock mode, and request stored
in the lookup intent if mdc_finish_enqueue() fails.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I233588ab13df86be509a9763e00697d29dee1c7c
Reviewed-on: http://review.whamcloud.com/10963
Tested-by: Jenkins
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
---

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 2d3d171..95201c4 100644
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -939,7 +939,12 @@ resend:
 			memset(lockh, 0, sizeof(*lockh));
 		}
 		ptlrpc_req_finished(req);
+
+		it->d.lustre.it_lock_handle = 0;
+		it->d.lustre.it_lock_mode = 0;
+		it->d.lustre.it_data = NULL;
 	}
+
 	RETURN(rc);
 }