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

Commit 0cb3284b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Get rid of NFS4CLNT_LAYOUTRECALL 



The NFS4CLNT_LAYOUTRECALL bit is a long-term impediment to scalability. It
basically stops all other recalls by a given server once any layout recall
is requested.

If the recall is for a different file, then we don't care.
If the recall applies to the same file, then we're in one of two situations:
Either we are in the case of a replay of an existing request, in which case
the session is supposed to deal with matters, or we are dealing with a
completely different request, in which case we should just try to process
it.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a59c30ac

fs/nfs/callback_proc.c

+1 −5
Original line number Diff line number Diff line
@@ -233,17 +233,13 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, 
static u32 do_callback_layoutrecall(struct nfs_client *clp,

				    struct cb_layoutrecallargs *args)

{

	u32 res = NFS4ERR_DELAY;

	u32 res;



	dprintk("%s enter, type=%i\n", __func__, args->cbl_recall_type);

	if (test_and_set_bit(NFS4CLNT_LAYOUTRECALL, &clp->cl_state))

		goto out;

	if (args->cbl_recall_type == RETURN_FILE)

		res = initiate_file_draining(clp, args);

	else

		res = initiate_bulk_draining(clp, args);

	clear_bit(NFS4CLNT_LAYOUTRECALL, &clp->cl_state);

out:

	dprintk("%s returning %i\n", __func__, res);

	return res;

fs/nfs/nfs4_fs.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ enum nfs4_client_state { 
	NFS4CLNT_RECLAIM_REBOOT,

	NFS4CLNT_RECLAIM_NOGRACE,

	NFS4CLNT_DELEGRETURN,

	NFS4CLNT_LAYOUTRECALL,

	NFS4CLNT_SESSION_RESET,

	NFS4CLNT_RECALL_SLOT,

	NFS4CLNT_LEASE_CONFIRM,