X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fdlm%2Fplock.c;h=eba87ff3177b6070284ee3eea402fd34c610c657;hb=cf9887f102541b8a0adb73f7da9c28d090622010;hp=78878c5781cadc0d13846d8af6a993039d8b39e6;hpb=064a32d82c20cdcb0119a8b316eb520608d8c647;p=linux-2.6-omap-h63xx.git

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index 78878c5781c..eba87ff3177 100644
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -116,7 +116,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
 	if (xop->callback == NULL)
 		wait_event(recv_wq, (op->done != 0));
 	else {
-		rv = -EINPROGRESS;
+		rv = FILE_LOCK_DEFERRED;
 		goto out;
 	}