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

Commit ce30e539 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

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: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 278c931c

fs/nfsd/nfs4state.c

+9 −3
Original line number Diff line number Diff line
@@ -4516,6 +4516,14 @@ nfs4_client_to_reclaim(const char *name) 
	return 1;

}



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)

{
@@ -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);

fs/nfsd/state.h

+1 −0
Original line number Diff line number Diff line
@@ -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);