leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFSD: Clean up forgetting clients

Browse Source 
I added in a generic for-each loop that takes a pass over the client_lru
list for the current net namespace and calls some function.  The next few
patches will update other operations to use this function as well.  A value
of 0 still means "forget everything that is found".

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Bryan Schumaker 2012-11-29 11:40:39 -05:00 committed by J. Bruce Fields
parent 043958395a
commit 44e34da60b
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfsd/netns.h
View File

@ -92,5 +92,8 @@ struct nfsd_net {
time_t nfsd4_grace; time_t nfsd4_grace;
}; };
/* Simple check to find out if a given net was properly initialized */
#define nfsd_netns_ready(nn) ((nn)->sessionid_hashtbl)
extern int nfsd_net_id; extern int nfsd_net_id;
#endif /* __NFSD_NETNS_H__ */ #endif /* __NFSD_NETNS_H__ */

25
fs/nfsd/nfs4state.c
View File

@ -4605,19 +4605,34 @@ nfs4_check_open_reclaim(clientid_t *clid, bool sessions, struct nfsd_net *nn)
#ifdef CONFIG_NFSD_FAULT_INJECTION #ifdef CONFIG_NFSD_FAULT_INJECTION
void nfsd_forget_clients(u64 num) u64 nfsd_forget_client(struct nfs4_client *clp, u64 max)
{
expire_client(clp);
return 1;
}
u64 nfsd_for_n_state(u64 max, u64 (*func)(struct nfs4_client *, u64))
{ {
struct nfs4_client *clp, *next; struct nfs4_client *clp, *next;
int count = 0; u64 count = 0;
struct nfsd_net *nn = net_generic(current->nsproxy->net_ns, nfsd_net_id); struct nfsd_net *nn = net_generic(current->nsproxy->net_ns, nfsd_net_id);
if (!nfsd_netns_ready(nn))
return 0;
list_for_each_entry_safe(clp, next, &nn->client_lru, cl_lru) { list_for_each_entry_safe(clp, next, &nn->client_lru, cl_lru) {
expire_client(clp); count += func(clp, max - count);
if (++count == num) if ((max != 0) && (count >= max))
break; break;
} }
printk(KERN_INFO "NFSD: Forgot %d clients", count); return count;
}
void nfsd_forget_clients(u64 num)
{
u64 count = nfsd_for_n_state(num, nfsd_forget_client);
printk(KERN_INFO "NFSD: Forgot %llu clients", count);
} }
static void release_lockowner_sop(struct nfs4_stateowner *sop) static void release_lockowner_sop(struct nfs4_stateowner *sop)