mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
NFSD: Lock state before calling fault injection function
Each function touches state in some way, so getting the lock earlier can help simplify code. Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
parent
e5f9570319
commit
043958395a
2 changed files with 4 additions and 16 deletions
|
@ -51,7 +51,9 @@ static int nfsd_inject_set(void *op_ptr, u64 val)
|
||||||
else
|
else
|
||||||
printk(KERN_INFO "NFSD Fault Injection: %s (n = %llu)", op->file, val);
|
printk(KERN_INFO "NFSD Fault Injection: %s (n = %llu)", op->file, val);
|
||||||
|
|
||||||
|
nfs4_lock_state();
|
||||||
op->func(val);
|
op->func(val);
|
||||||
|
nfs4_unlock_state();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4611,13 +4611,11 @@ void nfsd_forget_clients(u64 num)
|
||||||
int count = 0;
|
int 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);
|
||||||
|
|
||||||
nfs4_lock_state();
|
|
||||||
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);
|
expire_client(clp);
|
||||||
if (++count == num)
|
if (++count == num)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
nfs4_unlock_state();
|
|
||||||
|
|
||||||
printk(KERN_INFO "NFSD: Forgot %d clients", count);
|
printk(KERN_INFO "NFSD: Forgot %d clients", count);
|
||||||
}
|
}
|
||||||
|
@ -4653,25 +4651,15 @@ static int nfsd_release_n_owners(u64 num, bool is_open_owner,
|
||||||
|
|
||||||
void nfsd_forget_locks(u64 num)
|
void nfsd_forget_locks(u64 num)
|
||||||
{
|
{
|
||||||
int count;
|
|
||||||
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
|
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
|
||||||
|
int count = nfsd_release_n_owners(num, false, release_lockowner_sop, nn);
|
||||||
nfs4_lock_state();
|
|
||||||
count = nfsd_release_n_owners(num, false, release_lockowner_sop, nn);
|
|
||||||
nfs4_unlock_state();
|
|
||||||
|
|
||||||
printk(KERN_INFO "NFSD: Forgot %d locks", count);
|
printk(KERN_INFO "NFSD: Forgot %d locks", count);
|
||||||
}
|
}
|
||||||
|
|
||||||
void nfsd_forget_openowners(u64 num)
|
void nfsd_forget_openowners(u64 num)
|
||||||
{
|
{
|
||||||
int count;
|
|
||||||
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
|
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
|
||||||
|
int count = nfsd_release_n_owners(num, true, release_openowner_sop, nn);
|
||||||
nfs4_lock_state();
|
|
||||||
count = nfsd_release_n_owners(num, true, release_openowner_sop, nn);
|
|
||||||
nfs4_unlock_state();
|
|
||||||
|
|
||||||
printk(KERN_INFO "NFSD: Forgot %d open owners", count);
|
printk(KERN_INFO "NFSD: Forgot %d open owners", count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4704,10 +4692,8 @@ void nfsd_forget_delegations(u64 num)
|
||||||
count = nfsd_process_n_delegations(num, &victims);
|
count = nfsd_process_n_delegations(num, &victims);
|
||||||
spin_unlock(&recall_lock);
|
spin_unlock(&recall_lock);
|
||||||
|
|
||||||
nfs4_lock_state();
|
|
||||||
list_for_each_entry_safe(dp, dnext, &victims, dl_recall_lru)
|
list_for_each_entry_safe(dp, dnext, &victims, dl_recall_lru)
|
||||||
unhash_delegation(dp);
|
unhash_delegation(dp);
|
||||||
nfs4_unlock_state();
|
|
||||||
|
|
||||||
printk(KERN_INFO "NFSD: Forgot %d delegations", count);
|
printk(KERN_INFO "NFSD: Forgot %d delegations", count);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue