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

Commit 0fe492db authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

nfsd: Convert nfs4_check_open_reclaim() to work with lookup_clientid() 



lookup_clientid is preferable to find_confirmed_client since it's able
to use the cached client in the compound state.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 2d91e895

fs/nfsd/nfs4proc.c

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

		case NFS4_OPEN_CLAIM_PREVIOUS:

			status = nfs4_check_open_reclaim(&open->op_clientid,

							 cstate->minorversion,

							 nn);

							 cstate, nn);

			if (status)

				goto out;

			open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED;

fs/nfsd/nfs4state.c

+10 −5
Original line number Diff line number Diff line
@@ -4969,16 +4969,21 @@ nfsd4_find_reclaim_client(const char *recdir, struct nfsd_net *nn) 
* Called from OPEN. Look for clientid in reclaim list.

*/

__be32

nfs4_check_open_reclaim(clientid_t *clid, bool sessions, struct nfsd_net *nn)

nfs4_check_open_reclaim(clientid_t *clid,

		struct nfsd4_compound_state *cstate,

		struct nfsd_net *nn)

{

	struct nfs4_client *clp;

	__be32 status;



	/* find clientid in conf_id_hashtbl */

	clp = find_confirmed_client(clid, sessions, nn);

	if (clp == NULL)

	status = lookup_clientid(clid, cstate, nn);

	if (status)

		return nfserr_reclaim_bad;



	return nfsd4_client_record_check(clp) ? nfserr_reclaim_bad : nfs_ok;

	if (nfsd4_client_record_check(cstate->clp))

		return nfserr_reclaim_bad;



	return nfs_ok;

}



#ifdef CONFIG_NFSD_FAULT_INJECTION

fs/nfsd/state.h

+2 −1
Original line number Diff line number Diff line
@@ -457,7 +457,8 @@ 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(const char *recdir,

							struct nfsd_net *nn);

extern __be32 nfs4_check_open_reclaim(clientid_t *clid, bool sessions, struct nfsd_net *nn);

extern __be32 nfs4_check_open_reclaim(clientid_t *clid,

		struct nfsd4_compound_state *cstate, struct nfsd_net *nn);

extern int set_callback_cred(void);

extern void nfsd4_init_callback(struct nfsd4_callback *);

extern void nfsd4_probe_callback(struct nfs4_client *clp);