dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

NFSD: Clean up forgetting openowners 

Using "forget_n_state()" forces me to implement the code needed to
forget a specific client's openowners.

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:41 -05:00 committed by J. Bruce Fields
parent fc29171f5b
commit 4dbdbda84f
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fs/nfsd/nfs4state.c
View File

@ -4637,6 +4637,26 @@ u64 nfsd_forget_client_locks(struct nfs4_client *clp, u64 max)
return nfsd_foreach_client_lock(clp, max, release_lockowner);
}
static u64 nfsd_foreach_client_open(struct nfs4_client *clp, u64 max, void (*func)(struct nfs4_openowner *))
{
struct nfs4_openowner *oop, *next;
u64 count = 0;
list_for_each_entry_safe(oop, next, &clp->cl_openowners, oo_perclient) {
if (func)
func(oop);
if (++count == max)
break;
}
return count;
}
u64 nfsd_forget_client_openowners(struct nfs4_client *clp, u64 max)
{
return nfsd_foreach_client_open(clp, max, release_openowner);
}
u64 nfsd_for_n_state(u64 max, u64 (*func)(struct nfs4_client *, u64))
{
struct nfs4_client *clp, *next;
@ -4661,30 +4681,6 @@ void nfsd_forget_clients(u64 num)
printk(KERN_INFO "NFSD: Forgot %llu clients", count);
}
static void release_openowner_sop(struct nfs4_stateowner *sop)
{
release_openowner(openowner(sop));
}
static int nfsd_release_n_owners(u64 num, bool is_open_owner,
void (*release_sop)(struct nfs4_stateowner *),
struct nfsd_net *nn)
{
int i, count = 0;
struct nfs4_stateowner *sop, *next;
for (i = 0; i < OWNER_HASH_SIZE; i++) {
list_for_each_entry_safe(sop, next, &nn->ownerstr_hashtbl[i], so_strhash) {
if (sop->so_is_open_owner != is_open_owner)
continue;
release_sop(sop);
if (++count == num)
return count;
}
}
return count;
}
void nfsd_forget_locks(u64 num)
{
u64 count = nfsd_for_n_state(num, nfsd_forget_client_locks);
@ -4693,9 +4689,8 @@ void nfsd_forget_locks(u64 num)
void nfsd_forget_openowners(u64 num)
{
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
int count = nfsd_release_n_owners(num, true, release_openowner_sop, nn);
printk(KERN_INFO "NFSD: Forgot %d open owners", count);
u64 count = nfsd_for_n_state(num, nfsd_forget_client_openowners);
printk(KERN_INFO "NFSD: Forgot %llu open owners", count);
}
static int nfsd_process_n_delegations(u64 num, struct list_head *list)