LU-1329 ptlrpc: resend request on -EINPROGRESS

[fs/lustre-release.git] / lustre / mdc / mdc_locks.c

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 746012e..855d2ee 100644 (file)
--- 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);
                 }
         }