diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-11-12 15:00:53 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-11-12 18:55:11 -0500 |
| commit | ce30e5392fcb26b6aa53bb16d06da1d7d8bb0863 (patch) | |
| tree | e5af94c019f84c460203f7e8ef449e7d1d74515c /fs | |
| parent | 278c931cb05ae624df8c82b6bdfbb0e03392cde7 (diff) | |
| download | op-kernel-dev-ce30e5392fcb26b6aa53bb16d06da1d7d8bb0863.zip op-kernel-dev-ce30e5392fcb26b6aa53bb16d06da1d7d8bb0863.tar.gz | |
nfsd: break out reclaim record removal into separate function
We'll need to be able to call this from nfs4recover.c eventually.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 12 | ||||
| -rw-r--r-- | fs/nfsd/state.h | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 18e5549..24dcda2 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4517,6 +4517,14 @@ nfs4_client_to_reclaim(const char *name) } void +nfs4_remove_reclaim_record(struct nfs4_client_reclaim *crp) +{ + list_del(&crp->cr_strhash); + kfree(crp); + reclaim_str_hashtbl_size--; +} + +void nfs4_release_reclaim(void) { struct nfs4_client_reclaim *crp = NULL; @@ -4526,9 +4534,7 @@ nfs4_release_reclaim(void) while (!list_empty(&reclaim_str_hashtbl[i])) { crp = list_entry(reclaim_str_hashtbl[i].next, struct nfs4_client_reclaim, cr_strhash); - list_del(&crp->cr_strhash); - kfree(crp); - reclaim_str_hashtbl_size--; + nfs4_remove_reclaim_record(crp); } } BUG_ON(reclaim_str_hashtbl_size); diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index c41c280..3528616 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -465,6 +465,7 @@ extern __be32 nfs4_preprocess_stateid_op(struct net *net, extern void nfs4_lock_state(void); extern void nfs4_unlock_state(void); extern int nfs4_in_grace(void); +void nfs4_remove_reclaim_record(struct nfs4_client_reclaim *); extern void nfs4_release_reclaim(void); extern struct nfs4_client_reclaim *nfsd4_find_reclaim_client(const char *recdir); extern __be32 nfs4_check_open_reclaim(clientid_t *clid, bool sessions); |
