[patch 1/9] lockd: dont return EAGAIN from blocking lock request

[Miklos Szeredi]

From: Miklos Szeredi <mszeredi@xxxxxxx>

EAGAIN does not make sense as a return value from a blocking lock
request, the lock should be retried by the kernel until either it is
successful or fails permanently.

Looking at the server side NLM_LCK_DENIED means a permanent error in
this case, so just turn this into an ENOLCK.

Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
CC: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
CC: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
---
 fs/lockd/clntproc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/fs/lockd/clntproc.c
===================================================================
--- linux-2.6.orig/fs/lockd/clntproc.c	2008-05-09 14:04:16.000000000 +0200
+++ linux-2.6/fs/lockd/clntproc.c	2008-05-09 14:04:46.000000000 +0200
@@ -808,7 +808,7 @@ nlm_stat_to_errno(__be32 status)
 	case NLM_LCK_GRANTED:
 		return 0;
 	case NLM_LCK_DENIED:
-		return -EAGAIN;
+		return -ENOLCK;
 	case NLM_LCK_DENIED_NOLOCKS:
 	case NLM_LCK_DENIED_GRACE_PERIOD:
 		return -ENOLCK;

--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/