X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_locks.c;h=855d2eef59f972199bad49669066b7317b5b6888;hp=746012e7b29bb352f2ca238e61a5f0c301df9906;hb=7223b4746c71bf450c178ed21ddf99a0e3e26a1a;hpb=9501a58dd776231e93327ad0de91a4a3022ec493

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 746012e..855d2ee 100644
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -733,6 +733,11 @@ resend:
         if (IS_ERR(req))
                 RETURN(PTR_ERR(req));
 
+	if (req != NULL && it && it->it_op & IT_CREAT)
+		/* ask ptlrpc not to resend on EINPROGRESS since we have our own
+		 * retry logic */
+		req->rq_no_retry_einprogress = 1;
+
         if (resends) {
                 req->rq_generation_set = 1;
                 req->rq_import_generation = generation;
@@ -791,7 +796,7 @@ resend:
                 if (generation == obddev->u.cli.cl_import->imp_generation) {
                         goto resend;
                 } else {
-                        CDEBUG(D_HA, "resned cross eviction\n");
+			CDEBUG(D_HA, "resend cross eviction\n");
                         RETURN(-EIO);
                 }
         }