summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJohn L. Hammond <john.hammond@intel.com>2014-08-15 20:48:07 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-17 20:38:42 +0400
commit7591805af511b7f71fec87c69a539d1d0cfb93a1 (patch)
treedf03e038a296d43619c982a40d6c9f14892da0a1 /drivers
parent6b2eb32e697d151ebaf52f9b0304d16f63a27b43 (diff)
downloadlinux-7591805af511b7f71fec87c69a539d1d0cfb93a1.tar.xz
staging/lustre/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> Reviewed-on: http://review.whamcloud.com/10963 Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5289 Reviewed-by: Lai Siyao <lai.siyao@intel.com> Signed-off-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/lustre/lustre/mdc/mdc_locks.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index c64a38eaee3e..d02bf313d591 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -944,7 +944,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;
}