NLM lock reclaim failure
Subsystems (3)
Hi Trond,
Attached is a tested patch for the bug I posted in the following mail Marc.
[email protected] wrote on 10/11/2006 04:28:16 PM:
Quoted 31 lines
I see an NLM lock reclaim failure (using 2.6.17). Let me describe the simple case first.
1. Client gets an NLM lock
2. Server reboots
3. Client sends lock reclaim request
4. On server,nlm_open()gets return codenfserr_dropit; error gets converted tonlm_lck_deniedbynlm_lookup_file().
5. Client gets status=1, the lock reclaim failedThis happens _only_ when the first call to nfsd (
fh_verify->exp_find) comes from lockd trying to find the file. Subsequent calls seem to work.
nlm_lookup_file()->nlm_fopen()->nfsd_open()->fh_verify()->exp_find()returnsnfserr_dropitThis problem may be related to the following commit to lockd (Trond's tree):
commit:26bcbf965f857c710adafd16cf424f043006b5dd
lockd: stop abusingfile_lock_listThe client earlier retained the list of outstanding locks regardless of reclaim return code. The change above removes all locks from the list and only adds them back after a successful reclaim. Since the reclaim fails, it is removed from the list; so the client will not try to reclaim the lock on a second failure.
Note that the problem is not on the client side - it seems the server that should drop the rpc when it gets
nfserr_dropiterror and not convert it to annlm_lck_denied.
Quoted 9 lines
It get even more complicated - when the server doesn't respond immediately to the reclaim, client will retry the rpc, on the second reclaim call, the server will grant the lock to the client but since the client already got the
nlm_lck_deniedfrom the first call, it has dropped it from it list. So now we have a lock on the server for a client that doesn't know that it holds the lock.Marc.
Index: lockd/svc.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/lockd/svc.c,v
retrieving revision 1.1.1.4
svc.c +41 -0
@@ -34,6 +34,7 @@#include <linux/sunrpc/svcsock.h> #include <linux/lockd/lockd.h> #include <linux/nfs.h> +#include <linux/nfsd/nfsd.h> #define NLMDBG_FACILITY NLMDBG_SVC#define LOCKD_BUFSIZE (1024 + NLMSVC_XDRSIZE)
@@ -320,6 +321,43 @@ }EXPORT_SYMBOL (lockd_down); +int +nlmsvc_dispatch (struct svc_rqst *rqstp,u32 *statp) +{ +struct svc_procedure *procp; +kxdrproc_t xdr; +struct kvec * argv = &rqstp->rq_arg.head[0 ]; +struct kvec * resv = &rqstp->rq_res.head[0 ]; + +dprintk ("lockd: nlmsvc_dispatch vers %d proc %d\n" , + rqstp->rq_vers, rqstp->rq_proc); + + procp = rqstp->rq_procinfo; + +/* Decode arguments */ + xdr = procp->pc_decode; + +if (xdr && !xdr (rqstp, argv->iov_base, rqstp->rq_argp)) { +dprintk ("lockd: failed to decode arguments!\n" ); + *statp = rpc_garbage_args; +return 1 ; + } +/* Now call the procedure handler, and encode status. */ + *statp = procp->pc_func (rqstp, rqstp->rq_argp, rqstp->rq_resp); +if (((struct nlm_res *)(rqstp->rq_resp))->status == nfserr_dropit) { +dprintk ("lockd: dropping request!\n" ); +return 0 ; + } +/* Encode reply */ +if (*statp == rpc_success && (xdr = procp->pc_encode) + && !xdr (rqstp, resv->iov_base+resv->iov_len, rqstp->rq_resp)) { +dprintk ("lockd: failed to encode reply\n" ); +/* serv->sv_stats->rpcsystemerr++; */ + *statp = rpc_system_err; + } +return 1 ; +} +/* * Sysctl parameters (same as module parameters, different interface). */
@@ -484,12 +522,14 @@ .vs_vers = 1, .vs_nproc = 17, .vs_proc = nlmsvc_procedures, + .vs_dispatch = nlmsvc_dispatch, .vs_xdrsize = NLMSVC_XDRSIZE, };static struct svc_version nlmsvc_version3 = { .vs_vers =3 , .vs_nproc =24 , .vs_proc = nlmsvc_procedures, + .vs_dispatch = nlmsvc_dispatch, .vs_xdrsize =NLMSVC_XDRSIZE , };#ifdef CONFIG_LOCKD_V4
@@ -497,6 +537,7 @@ .vs_vers = 4, .vs_nproc = 24, .vs_proc = nlmsvc_procedures4, + .vs_dispatch = nlmsvc_dispatch, .vs_xdrsize = NLMSVC_XDRSIZE, };#endif
Index: lockd/svcsubs.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/lockd/svcsubs.c,v retrieving revision 1.1.1.4
svcsubs.c +7 -4
@@ -16,6 +16,7 @@#include <linux/sunrpc/clnt.h> #include <linux/nfsd/nfsfh.h> #include <linux/nfsd/export.h> +#include <linux/nfsd/nfsd.h> #include <linux/lockd/lockd.h> #include <linux/lockd/share.h> #include <linux/lockd/sm_inter.h>
@@ -136,12 +137,14 @@ out_free:kfree (file); +if (nfserr != nfserr_dropit) {#ifdef CONFIG_LOCKD_V4 -if (nfserr ==1 ) - nfserr = nlm4_stale_fh; - else +if (nfserr ==1 ) + nfserr = nlm4_stale_fh; + else#endif - nfserr = nlm_lck_denied; + nfserr = nlm_lck_denied; + } goto out_unlock; }
Index: nfsd/lockd.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/lockd.c,v
retrieving revision 1.1.1.3
lockd.c +2 -0
@@ -49,6 +49,8 @@return 0 ;case nfserr_stale:return 1 ; +case nfserr_dropit: +return nfserr;default :return 2 ; }
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
Quoted 3 lines · On Thursday October 12, [email protected] wrote:
Hi Trond,
Attached is a tested patch for the bug I posted in the following mail Marc.
Thanks for this patch, for the discovering/understanding the bug.
There are a couple of aspects of that patch that I don't really like.
One is adding the nlmsvc_dispatch function just to gain a little bit of functionality that the sunrpc layer should probably provide directly.
The other is that blurring of nfsd and nlm error codes.
The following patch addresses these issues and is essentially a rewrite of you patch.
Would you be able to review/test it?
It fixed nfsv2 as well which needed and extra little fix.
Thanks a lot,
NeilBrown
------------------
Allow lockd to drop replys as appropriate.
### Diffstat output
./fs/lockd/svc4proc.c | 12 ++++++------ ./fs/lockd/svcproc.c | 16 +++++++++------- ./fs/lockd/svcsubs.c | 5 ++++- ./fs/nfsd/lockd.c | 3 +++ ./include/linux/lockd/xdr.h | 2 ++ ./include/linux/sunrpc/msg_prot.h | 4 +++- ./include/linux/sunrpc/xdr.h | 1 + ./net/sunrpc/svc.c | 5 +++++ 8 files changed, 33 insertions(+), 15 deletions(-)
fs/lockd/svc4proc.c +6 -6
@@ -96,7 +96,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp/* 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/* 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 *rqs/* 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 *rqs/* 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 *rqst/* 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 *rq/* 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);
fs/lockd/svcproc.c +9 -7
@@ -59,7 +59,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstruct nlm_host *host =NULL ;struct nlm_file *file =NULL ;struct nlm_lock *lock = &argp->lock; -u32 error; +u32 error =0 ;/* nfsd callbacks must have been installed for this procedure */ if (!nlmsvc_ops)
@@ -88,6 +88,8 @@ nlmsvc_retrieve_args(struct svc_rqst *rq no_locks:if (host)nlm_release_host (host); +if (error) +return error;return nlm_lck_denied_nolocks; }
@@ -122,7 +124,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp,/* Obtain client and file */ if ((resp->status =nlmsvc_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 =cast_status (nlmsvc_testlock (file, &argp->lock, &resp->lock));
@@ -153,7 +155,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp,/* Obtain client and file */ if ((resp->status =nlmsvc_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
@@ -196,7 +198,7 @@ nlmsvc_proc_cancel(struct svc_rqst *rqst/* Obtain client and file */ if ((resp->status =nlmsvc_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 =cast_status (nlmsvc_cancel_blocked (file, &argp->lock));
@@ -229,7 +231,7 @@ nlmsvc_proc_unlock(struct svc_rqst *rqst/* Obtain client and file */ if ((resp->status =nlmsvc_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 =cast_status (nlmsvc_unlock (file, &argp->lock));
@@ -368,7 +370,7 @@ nlmsvc_proc_share(struct svc_rqst *rqstp/* Obtain client and file */ if ((resp->status =nlmsvc_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 =cast_status (nlmsvc_share_file (host, file, argp));
@@ -401,7 +403,7 @@ nlmsvc_proc_unshare(struct svc_rqst *rqs/* Obtain client and file */ if ((resp->status =nlmsvc_retrieve_args (rqstp, argp, &host, &file))) -return rpc_success; +return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;/* Now try to unshare the file */ resp->status =cast_status (nlmsvc_unshare_file (host, file, argp));
fs/lockd/svcsubs.c +4 -1
@@ -140,7 +140,10 @@ out_free: nfserr = nlm4_stale_fh; else#endif - nfserr = nlm_lck_denied; +if (nfserr ==3 ) + nfserr = nlm_drop_reply; +else + nfserr = nlm_lck_denied; goto out_unlock; }
fs/nfsd/lockd.c +3 -0
@@ -43,12 +43,15 @@ nlm_fopen(struct svc_rqst *rqstp, struct* we invent: 0 = no error * 1 = stale file handle * 2 = other error +* 3 = try again later */ switch (nfserr) {case nfs_ok:return 0 ;case nfserr_stale:return 1 ; +case nfserr_dropit: +return 3 ;default :return 2 ; }
include/linux/lockd/xdr.h +2 -0
@@ -22,6 +22,8 @@#define nlm_lck_blocked __constant_htonl(NLM_LCK_BLOCKED)#define nlm_lck_denied_grace_period __constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD) +#define nlm_drop_reply __constant_htonl(30000) +/* Lock info passed via NLM */ struct nlm_lock {char * caller;
include/linux/sunrpc/msg_prot.h +3 -1
@@ -56,7 +56,9 @@ enum rpc_accept_stat {RPC_PROG_MISMATCH =2 ,RPC_PROC_UNAVAIL =3 ,RPC_GARBAGE_ARGS =4 , -RPC_SYSTEM_ERR =5 +RPC_SYSTEM_ERR =5 , +/* internal use only */ + RPC_DROP_REPLY = 60000, }; enum rpc_reject_stat {
include/linux/sunrpc/xdr.h +1 -0
@@ -74,6 +74,7 @@ struct xdr_buf {#define rpc_proc_unavail __constant_htonl(RPC_PROC_UNAVAIL)#define rpc_garbage_args __constant_htonl(RPC_GARBAGE_ARGS)#define rpc_system_err __constant_htonl(RPC_SYSTEM_ERR) +#define rpc_drop_reply __constant_htonl(RPC_DROP_REPLY)#define rpc_auth_ok __constant_htonl(RPC_AUTH_OK)#define rpc_autherr_badcred __constant_htonl(RPC_AUTH_BADCRED)
net/sunrpc/svc.c +5 -0
@@ -825,6 +825,11 @@ svc_process(struct svc_rqst *rqstp) *statp = procp->pc_func (rqstp, rqstp->rq_argp, rqstp->rq_resp);/* Encode reply */ +if (*statp == rpc_drop_reply) { +if (procp->pc_release) + procp->pc_release (rqstp,NULL , rqstp->rq_resp); + goto dropit; + }if (*statp == rpc_success && (xdr = procp->pc_encode) && !xdr (rqstp, resv->iov_base+resv->iov_len, rqstp->rq_resp)) {dprintk ("svc: failed to encode reply\n" );
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
[email protected] wrote on 10/13/2006 12:08:39 AM:
Quoted 7 lines · On Thursday October 12, [email protected] wrote:
Quoted 3 lines
Hi Trond,
Attached is a tested patch for the bug I posted in the following mail Marc.Thanks for this patch, for the discovering/understanding the bug.
Quoted 7 lines
There are a couple of aspects of that patch that I don't really like.
One is adding the
nlmsvc_dispatchfunction just to gain a little bit of functionality that the sunrpc layer should probably provide directly.The other is that blurring of nfsd and nlm error codes.
Your patch is much cleaner with exception of using hard coded return codes in nlm_fopen().
Quoted 6 lines
The following patch addresses these issues and is essentially a rewrite of you patch.
Would you be able to review/test it?
Yes, I tested it and it fixes the problem. hope to see it in the kernel soon.
Thanks, Marc
Quoted 25 lines
It fixed nfsv2 as well which needed and extra little fix.
Thanks a lot,
NeilBrown------------------
Allow lockd to drop replys as appropriate.Signed-off-by Neil Brown <[email protected]>### Diffstat output
./fs/lockd/svc4proc.c | 12 ++++++------ ./fs/lockd/svcproc.c | 16 +++++++++------- ./fs/lockd/svcsubs.c | 5 ++++- ./fs/nfsd/lockd.c | 3 +++ ./include/linux/lockd/xdr.h | 2 ++ ./include/linux/sunrpc/msg_prot.h | 4 +++- ./include/linux/sunrpc/xdr.h | 1 + ./net/sunrpc/svc.c | 5 +++++ 8 files changed, 33 insertions(+), 15 deletions(-)diff
.prev/fs/lockd/svc4proc.c./fs/lockd/svc4proc.c
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_test(struct svc_rqst *rqstp · line 98
Quoted 3 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0@@ -96,7 +96,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp /* Obtain client and file */ if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_test(struct svc_rqst *rqstp · line 99
Quoted 2 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_lock(struct svc_rqst *rqstp · line 128
Quoted 7 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* 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 /* Obtain client and file */ if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_lock(struct svc_rqst *rqstp · line 129
Quoted 2 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_cancel(struct svc_rqst *rqs · line 171
Quoted 7 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0#if 0 /* If supplied state doesn't match current state, we assume it's@@ -169,7 +169,7 @@ nlm4svc_proc_cancel(struct svc_rqst *rqs /* Obtain client and file */ if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_cancel(struct svc_rqst *rqs · line 172
Quoted 2 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_unlock(struct svc_rqst *rqs · line 204
Quoted 7 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* Try to cancel request. */ resp->status = nlmsvc_cancel_blocked(file, &argp->lock);@@ -202,7 +202,7 @@ nlm4svc_proc_unlock(struct svc_rqst *rqs /* Obtain client and file */ if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_unlock(struct svc_rqst *rqs · line 205
Quoted 2 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_share(struct svc_rqst *rqst · line 341
Quoted 7 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* Now try to remove the lock */ resp->status = nlmsvc_unlock(file, &argp->lock);@@ -339,7 +339,7 @@ nlm4svc_proc_share(struct svc_rqst *rqst /* Obtain client and file */ if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_share(struct svc_rqst *rqst · line 342
Quoted 2 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_unshare(struct svc_rqst *rq · line 374
Quoted 7 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* Now try to create the share */ resp->status = nlmsvc_share_file(host, file, argp);@@ -372,7 +372,7 @@ nlm4svc_proc_unshare(struct svc_rqst *rq /* Obtain client and file */ if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 nlm4svc_proc_unshare(struct svc_rqst *rq · line 375
Quoted 2 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
Quoted 26 lines
fs/lockd/svc4proc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svc4proc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* Now try to lock the file */ resp->status = nlmsvc_unshare_file(host, file, argp);diff
.prev/fs/lockd/svcproc.c./fs/lockd/svcproc.cfs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +3
-1@@ -59,7 +59,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rq struct nlm_host *host = NULL; struct nlm_file *file = NULL; struct nlm_lock *lock = &argp->lock; - u32 error; + u32 error = 0; /* nfsd callbacks must have been installed for this procedure */ if (!nlmsvc_ops)@@ -88,6 +88,8 @@ nlmsvc_retrieve_args(struct svc_rqst *rq no_locks: if (host) nlm_release_host(host); + if (error) + return error; return nlm_lck_denied_nolocks; }
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_test(struct svc_rqst *rqstp, · line 126
Quoted 3 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0@@ -122,7 +124,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, /* Obtain client and file */ if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_test(struct svc_rqst *rqstp, · line 127
Quoted 2 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_lock(struct svc_rqst *rqstp, · line 157
Quoted 8 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* Now check for conflicting locks */ resp->status = cast_status(nlmsvc_testlock(file, &argp->lock, &resp->lock));@@ -153,7 +155,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, /* Obtain client and file */ if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_lock(struct svc_rqst *rqstp, · line 158
Quoted 2 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_cancel(struct svc_rqst *rqst · line 200
Quoted 7 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0#if 0 /* If supplied state doesn't match current state, we assume it's@@ -196,7 +198,7 @@ nlmsvc_proc_cancel(struct svc_rqst *rqst /* Obtain client and file */ if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_cancel(struct svc_rqst *rqst · line 201
Quoted 2 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_cancel(struct svc_rqst *rqst · line 203
Quoted 3 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* Try to cancel request. */ resp->status = cast_status(nlmsvc_cancel_blocked(file,
&argp->lock));
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_unlock(struct svc_rqst *rqst · line 233
Quoted 4 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0@@ -229,7 +231,7 @@ nlmsvc_proc_unlock(struct svc_rqst *rqst /* Obtain client and file */ if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_unlock(struct svc_rqst *rqst · line 234
Quoted 2 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_share(struct svc_rqst *rqstp · line 372
Quoted 7 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* Now try to remove the lock */ resp->status = cast_status(nlmsvc_unlock(file, &argp->lock));@@ -368,7 +370,7 @@ nlmsvc_proc_share(struct svc_rqst *rqstp /* Obtain client and file */ if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_share(struct svc_rqst *rqstp · line 373
Quoted 2 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_unshare(struct svc_rqst *rqs · line 405
Quoted 7 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* Now try to create the share */ resp->status = cast_status(nlmsvc_share_file(host, file, argp));@@ -401,7 +403,7 @@ nlmsvc_proc_unshare(struct svc_rqst *rqs /* Obtain client and file */ if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host,
&file)))
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 nlmsvc_proc_unshare(struct svc_rqst *rqs · line 406
Quoted 2 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +1
-1- return rpc_success; + return resp->status == nlm_drop_reply ? rpc_drop_reply
:rpc_success;
Quoted 40 lines
fs/lockd/svcproc.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcproc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0/* Now try to unshare the file */ resp->status = cast_status(nlmsvc_unshare_file(host, file, argp));diff
.prev/fs/lockd/svcsubs.c./fs/lockd/svcsubs.cfs/lockd/svcsubs.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/lockd/svcsubs.c 2006-10-13 17:02:07.000000000 +1000 +4
-1@@ -140,7 +140,10 @@ out_free: nfserr = nlm4_stale_fh; else #endif - nfserr = nlm_lck_denied; + if (nfserr == 3) + nfserr = nlm_drop_reply; + else + nfserr = nlm_lck_denied; goto out_unlock; }diff
.prev/fs/nfsd/lockd.c./fs/nfsd/lockd.cfs/nfsd/lockd.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/nfsd/lockd.c 2006-10-13 17:01:33.000000000 +1000 +3
-0@@ -43,12 +43,15 @@ nlm_fopen(struct svc_rqst *rqstp, struct * we invent: 0 = no error * 1 = stale file handle * 2 = other error + * 3 = try again later */ switch (nfserr) { case nfs_ok: return 0; case nfserr_stale: return 1; + case nfserr_dropit: + return 3; default: return 2; }
Quoted 2 lines
diff
.prev/include/linux/lockd/xdr.h./include/linux/lockd/xdr.h
---.prev/include/linux/lockd/xdr.h2006-10-13 17:01:33.000000000
+1000
Quoted 12 lines
+++
./include/linux/lockd/xdr.h2006-10-13 17:02:43.000000000 +1000fs/nfsd/lockd.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/nfsd/lockd.c 2006-10-13 17:01:33.000000000 +1000 +2
-0@@ -22,6 +22,8 @@ #define nlm_lck_blocked __constant_htonl(NLM_LCK_BLOCKED) #define nlm_lck_denied_grace_period __constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD) +#define nlm_drop_reply __constant_htonl(30000) + /* Lock info passed via NLM */ struct nlm_lock {char * caller;
Quoted 1 line
diff
.prev/include/linux/sunrpc/msg_prot.h
./include/linux/sunrpc/msg_prot.h
Quoted 3 lines
---
.prev/include/linux/sunrpc/msg_prot.h2006-10-13 17:01:33.
000000000 +1000
+++./include/linux/sunrpc/msg_prot.h2006-10-13 17:02:43.000000000
+1000
Quoted 12 lines
fs/nfsd/lockd.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/nfsd/lockd.c 2006-10-13 17:01:33.000000000 +1000 +3
-1@@ -56,7 +56,9 @@ enum rpc_accept_stat { RPC_PROG_MISMATCH = 2, RPC_PROC_UNAVAIL = 3, RPC_GARBAGE_ARGS = 4, - RPC_SYSTEM_ERR = 5 + RPC_SYSTEM_ERR = 5, + /* internal use only */ + RPC_DROP_REPLY = 60000, }; enum rpc_reject_stat {
Quoted 2 lines
diff
.prev/include/linux/sunrpc/xdr.h./include/linux/sunrpc/xdr.h
---.prev/include/linux/sunrpc/xdr.h2006-10-13 17:01:33.000000000
+1000
Quoted 17 lines
+++
./include/linux/sunrpc/xdr.h2006-10-13 17:02:43.000000000 +1000fs/nfsd/lockd.c 2006-10-13 17:02:43.000000000 +1000 renamed from fs/nfsd/lockd.c 2006-10-13 17:01:33.000000000 +1000 +1
-0@@ -74,6 +74,7 @@ struct xdr_buf { #define rpc_proc_unavail __constant_htonl(RPC_PROC_UNAVAIL) #define rpc_garbage_args __constant_htonl(RPC_GARBAGE_ARGS) #define rpc_system_err __constant_htonl(RPC_SYSTEM_ERR) +#define rpc_drop_reply __constant_htonl(RPC_DROP_REPLY) #define rpc_auth_ok __constant_htonl(RPC_AUTH_OK) #define rpc_autherr_badcred __constant_htonl(RPC_AUTH_BADCRED)diff
.prev/net/sunrpc/svc.c./net/sunrpc/svc.cnet/sunrpc/svc.c 2006-10-13 17:02:43.000000000 +1000 renamed from net/sunrpc/svc.c 2006-10-13 17:01:33.000000000 +1000 +0
-0@@ -825,6 +825,11 @@ svc_process(struct svc_rqst *rqstp) *statp = procp->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp);
net/sunrpc/svc.c 2006-10-13 17:02:43.000000000 +1000 svc_process(struct svc_rqst *rqstp) · line 835
Quoted 10 lines
net/sunrpc/svc.c 2006-10-13 17:02:43.000000000 +1000 renamed from net/sunrpc/svc.c 2006-10-13 17:01:33.000000000 +1000 +5
-0/* Encode reply */ + if (*statp == rpc_drop_reply) { + if (procp->pc_release) + procp->pc_release(rqstp, NULL, rqstp->rq_resp); + goto dropit; + } if (*statp == rpc_success && (xdr = procp->pc_encode) && !xdr(rqstp, resv->iov_base+resv->iov_len, rqstp->rq_resp)) { dprintk("svc: failed to encode reply\n");
-------------------------------------------------------------------------
Quoted 1 line
Using Tomcat but need to do more? Need to support web services,
security?
Quoted 1 line
Get stuff done quickly with pre-integrated technology to make your job
easier
Quoted 1 line
Download IBM WebSphere Application Server v.1.0.1 based on Apache
Geronimo
Quoted 4 lines
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
Quoted 6 lines · On Friday October 13, [email protected] wrote:
Quoted 2 lines
The other is that blurring of nfsd and nlm error codes.
Your patch is much cleaner with exception of using hard coded return codes in
nlm_fopen().
Yes.. fair comment. I'll change nlm_fopen to return nlm error codes. That makes it much nicer.
Quoted 10 lines
Quoted 6 lines
The following patch addresses these issues and is essentially a rewrite of you patch.
Would you be able to review/test it?
Yes, I tested it and it fixes the problem. hope to see it in the kernel soon.
Thanks, Marc
Thanks. I'll send it to Andrew shortly.
NeilBrown
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs