Commit 4dbdbda8 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by J. Bruce Fields
Browse files

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: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent fc29171f

fs/nfsd/nfs4state.c

+22 −27
Original line number Diff line number Diff line
@@ -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)