Commit 1722b046 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Chuck Lever
Browse files

nfsd: simplify nfsd4_check_open_reclaim 



The set_client() was already taken care of by process_open1().

The comments here are mostly redundant with the code.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent f71475ba

fs/nfsd/nfs4proc.c

+1 −2
Original line number Diff line number Diff line
@@ -428,8 +428,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
				goto out;

			break;

		case NFS4_OPEN_CLAIM_PREVIOUS:

			status = nfs4_check_open_reclaim(&open->op_clientid,

							 cstate, nn);

			status = nfs4_check_open_reclaim(cstate->clp);

			if (status)

				goto out;

			open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED;

fs/nfsd/nfs4state.c

+3 −15
Original line number Diff line number Diff line
@@ -7222,25 +7222,13 @@ nfsd4_find_reclaim_client(struct xdr_netobj name, struct nfsd_net *nn) 
	return NULL;

}



/*

* Called from OPEN. Look for clientid in reclaim list.

*/

__be32

nfs4_check_open_reclaim(clientid_t *clid,

		struct nfsd4_compound_state *cstate,

		struct nfsd_net *nn)

nfs4_check_open_reclaim(struct nfs4_client *clp)

{

	__be32 status;



	/* find clientid in conf_id_hashtbl */

	status = set_client(clid, cstate, nn);

	if (status)

		return nfserr_reclaim_bad;



	if (test_bit(NFSD4_CLIENT_RECLAIM_COMPLETE, &cstate->clp->cl_flags))

	if (test_bit(NFSD4_CLIENT_RECLAIM_COMPLETE, &clp->cl_flags))

		return nfserr_no_grace;



	if (nfsd4_client_record_check(cstate->clp))

	if (nfsd4_client_record_check(clp))

		return nfserr_reclaim_bad;



	return nfs_ok;

fs/nfsd/state.h

+1 −2
Original line number Diff line number Diff line
@@ -649,8 +649,7 @@ void nfs4_remove_reclaim_record(struct nfs4_client_reclaim *, struct nfsd_net *) 
extern void nfs4_release_reclaim(struct nfsd_net *);

extern struct nfs4_client_reclaim *nfsd4_find_reclaim_client(struct xdr_netobj name,

							struct nfsd_net *nn);

extern __be32 nfs4_check_open_reclaim(clientid_t *clid,

		struct nfsd4_compound_state *cstate, struct nfsd_net *nn);

extern __be32 nfs4_check_open_reclaim(struct nfs4_client *);

extern void nfsd4_probe_callback(struct nfs4_client *clp);

extern void nfsd4_probe_callback_sync(struct nfs4_client *clp);

extern void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *);