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

nfsd: add a list_head arg to nfsd_foreach_client_lock

Browse Source 
In a later patch, we'll want to collect the locks onto a list for later
destruction. If "func" is defined and "collect" is defined, then we'll
add the lock stateid to the list.

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Jeff Layton
2014-07-30 08:27:20 -04:00
committed by J. Bruce Fields
parent 69fc9edf98
commit 3738d50e7f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nfsd/nfs4state.c
View File

@@ -5811,6 +5811,7 @@ static void nfsd_print_count(struct nfs4_client *clp, unsigned int count,
} }
static u64 nfsd_foreach_client_lock(struct nfs4_client *clp, u64 max, static u64 nfsd_foreach_client_lock(struct nfs4_client *clp, u64 max,
struct list_head *collect,
void (*func)(struct nfs4_ol_stateid *)) void (*func)(struct nfs4_ol_stateid *))
{ {
struct nfs4_openowner *oop; struct nfs4_openowner *oop;
@@ -5823,8 +5824,12 @@ static u64 nfsd_foreach_client_lock(struct nfs4_client *clp, u64 max,
&oop->oo_owner.so_stateids, st_perstateowner) { &oop->oo_owner.so_stateids, st_perstateowner) {
list_for_each_entry_safe(lst, lst_next, list_for_each_entry_safe(lst, lst_next,
&stp->st_locks, st_locks) { &stp->st_locks, st_locks) {
if (func) if (func) {
func(lst); func(lst);
if (collect)
list_add(&lst->st_locks,
collect);
}
if (++count == max) if (++count == max)
return count; return count;
} }
@@ -5836,12 +5841,12 @@ static u64 nfsd_foreach_client_lock(struct nfs4_client *clp, u64 max,
u64 nfsd_forget_client_locks(struct nfs4_client *clp, u64 max) u64 nfsd_forget_client_locks(struct nfs4_client *clp, u64 max)
{ {
return nfsd_foreach_client_lock(clp, max, release_lock_stateid); return nfsd_foreach_client_lock(clp, max, NULL, release_lock_stateid);
} }
u64 nfsd_print_client_locks(struct nfs4_client *clp, u64 max) u64 nfsd_print_client_locks(struct nfs4_client *clp, u64 max)
{ {
u64 count = nfsd_foreach_client_lock(clp, max, NULL); u64 count = nfsd_foreach_client_lock(clp, max, NULL, NULL);
nfsd_print_count(clp, count, "locked files"); nfsd_print_count(clp, count, "locked files");
return count; return count;
} }