forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: make nfs4_client_to_reclaim return a pointer to the reclaim record

Browse source 
Later callers will need to make changes to the record.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Jeff Layton 2012-11-12 15:00:54 -05:00 • committed by J. Bruce Fields
parent ce30e5392f
commit 772a9bbbb5
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
fs/nfsd/nfs4state.c
View file

@ -4498,22 +4498,22 @@ nfs4_has_reclaimed_state(const char *name)
/* /*
* failure => all reset bets are off, nfserr_no_grace... * failure => all reset bets are off, nfserr_no_grace...
*/ */
int struct nfs4_client_reclaim *
nfs4_client_to_reclaim(const char *name) nfs4_client_to_reclaim(const char *name)
{ {
unsigned int strhashval; unsigned int strhashval;
struct nfs4_client_reclaim *crp = NULL; struct nfs4_client_reclaim *crp;
dprintk("NFSD nfs4_client_to_reclaim NAME: %.*s\n", HEXDIR_LEN, name); dprintk("NFSD nfs4_client_to_reclaim NAME: %.*s\n", HEXDIR_LEN, name);
crp = alloc_reclaim(); crp = alloc_reclaim();
if (!crp) if (crp) {
return 0; strhashval = clientstr_hashval(name);
strhashval = clientstr_hashval(name); INIT_LIST_HEAD(&crp->cr_strhash);
INIT_LIST_HEAD(&crp->cr_strhash); list_add(&crp->cr_strhash, &reclaim_str_hashtbl[strhashval]);
list_add(&crp->cr_strhash, &reclaim_str_hashtbl[strhashval]); memcpy(crp->cr_recdir, name, HEXDIR_LEN);
memcpy(crp->cr_recdir, name, HEXDIR_LEN); reclaim_str_hashtbl_size++;
reclaim_str_hashtbl_size++; }
return 1; return crp;
} }
void void

2
fs/nfsd/state.h
View file

@ -482,7 +482,7 @@ extern void nfsd4_destroy_callback_queue(void);
extern void nfsd4_shutdown_callback(struct nfs4_client *); extern void nfsd4_shutdown_callback(struct nfs4_client *);
extern void nfs4_put_delegation(struct nfs4_delegation *dp); extern void nfs4_put_delegation(struct nfs4_delegation *dp);
extern __be32 nfs4_make_rec_clidname(char *clidname, struct xdr_netobj *clname); extern __be32 nfs4_make_rec_clidname(char *clidname, struct xdr_netobj *clname);
extern int nfs4_client_to_reclaim(const char *name); extern struct nfs4_client_reclaim *nfs4_client_to_reclaim(const char *name);
extern int nfs4_has_reclaimed_state(const char *name); extern int nfs4_has_reclaimed_state(const char *name);
extern void release_session_client(struct nfsd4_session *); extern void release_session_client(struct nfsd4_session *);
extern void nfsd4_purge_closed_stateid(struct nfs4_stateowner *); extern void nfsd4_purge_closed_stateid(struct nfs4_stateowner *);