Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d343fce1 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[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: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4481d103

fs/lockd/svc4proc.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

fs/lockd/svcproc.c

+9 −7
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 
	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 *rqstp, struct nlm_args *argp, 
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, struct nlm_args *argp, 


	/* 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, struct nlm_args *argp, 


	/* 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 *rqstp, struct nlm_args *argp, 


	/* 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 *rqstp, struct nlm_args *argp, 


	/* 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, struct nlm_args *argp, 


	/* 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 *rqstp, struct nlm_args *argp, 


	/* 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

+0 −6
Original line number Diff line number Diff line
@@ -135,12 +135,6 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result, 


out_free:

	kfree(file);

#ifdef CONFIG_LOCKD_V4

	if (nfserr == 1)

		nfserr = nlm4_stale_fh;

	else

#endif

	nfserr = nlm_lck_denied;

	goto out_unlock;

}

fs/nfsd/lockd.c

+8 −6
Original line number Diff line number Diff line
@@ -39,18 +39,20 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp) 
	fh_put(&fh);

	rqstp->rq_client = NULL;

	exp_readunlock();

 	/* nlm and nfsd don't share error codes.

	 * we invent: 0 = no error

	 *            1 = stale file handle

	 *	      2 = other error

 	/* We return nlm error codes as nlm doesn't know

	 * about nfsd, but nfsd does know about nlm..

	 */

	switch (nfserr) {

	case nfs_ok:

		return 0;

	case nfserr_dropit:

		return nlm_drop_reply;

#ifdef CONFIG_LOCKD_V4

	case nfserr_stale:

		return 1;

		return nlm4_stale_fh;

#endif

	default:

		return 2;

		return nlm_lck_denied;

	}

}

include/linux/lockd/bind.h

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ 
#define LINUX_LOCKD_BIND_H



#include <linux/lockd/nlm.h>

/* need xdr-encoded error codes too, so... */

#include <linux/lockd/xdr.h>

#ifdef CONFIG_LOCKD_V4

#include <linux/lockd/xdr4.h>

#endif



/* Dummy declarations */

struct svc_rqst;