X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_lock.c;h=9e466793f97cb603d00a4c8bc7dcf2a1817d1424;hb=a7f48e6c15e28617793d89958c79e9ed8cb73e65;hp=62da056e2876e9b6f2e403d42f4761670ee58c76;hpb=5309e108582c692f3b60705818fddc4a3b3b1345;p=fs%2Flustre-release.git

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index 62da056..9e46679 100644
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -309,7 +309,7 @@ static int osc_lock_upcall(void *cookie, struct lustre_handle *lockh,
 		/* Hide the error. */
 		rc = 0;
 	} else if (rc < 0 && oscl->ols_flags & LDLM_FL_NDELAY) {
-		rc = -EWOULDBLOCK;
+		rc = -EAGAIN;
 	}
 
 	if (oscl->ols_owner != NULL)