[PATCH] knfsd: Allow lockd to drop replies as appropriate

It is possible for the ->fopen callback from lockd into nfsd to find that an
answer cannot be given straight away (an upcall is needed) and so the request
has to be 'dropped', to be retried later.  That error status is not currently
propagated back.

So:
  Change nlm_fopen to return nlm error codes (rather than a private
  protocol) and define a new nlm_drop_reply code.
  Cause nlm_drop_reply to cause the rpc request to get rpc_drop_reply
  when this error comes back.
  Cause svc_process to drop a request which returns a status of
  rpc_drop_reply.

[akpm@osdl.org: fix warning storm]
Cc: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index fa370f6eb07b..399ad11b97be 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -96,7 +96,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         /* Obtain client and file */
         if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))
-                return rpc_success;
+                return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Now check for conflicting locks */
         resp->status = nlmsvc_testlock(file, &argp->lock, &resp->lock);
@@ -126,7 +126,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         /* Obtain client and file */
         if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))
-                return rpc_success;
+                return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
 #if 0
         /* If supplied state doesn't match current state, we assume it's
@@ -169,7 +169,7 @@ nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         /* Obtain client and file */
         if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))
-                return rpc_success;
+                return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Try to cancel request. */
         resp->status = nlmsvc_cancel_blocked(file, &argp->lock);
@@ -202,7 +202,7 @@ nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         /* Obtain client and file */
         if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))
-                return rpc_success;
+                return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Now try to remove the lock */
         resp->status = nlmsvc_unlock(file, &argp->lock);
@@ -339,7 +339,7 @@ nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         /* Obtain client and file */
         if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))
-                return rpc_success;
+                return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Now try to create the share */
         resp->status = nlmsvc_share_file(host, file, argp);
@@ -372,7 +372,7 @@ nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         /* Obtain client and file */
         if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))
-                return rpc_success;
+                return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Now try to lock the file */
         resp->status = nlmsvc_unshare_file(host, file, argp);