xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lockd: NLM grace period shouldn't block NFSv4 opens

Browse Source 
NLM locks don't conflict with NFSv4 share reservations, so we're not
going to learn anything new by watiting for them.

They do conflict with NFSv4 locks and with delegations.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields
2015-08-06 12:47:02 -04:00
parent 4bc6603778
commit c87fb4a378
5 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fs/nfs_common/grace.c
View File

@@ -63,14 +63,33 @@ EXPORT_SYMBOL_GPL(locks_end_grace);
* lock reclaims.
*/
int
locks_in_grace(struct net *net)
__state_in_grace(struct net *net, bool open)
{
struct list_head *grace_list = net_generic(net, grace_net_id);
struct lock_manager *lm;
return !list_empty(grace_list);
if (!open)
return !list_empty(grace_list);
list_for_each_entry(lm, grace_list, list) {
if (lm->block_opens)
return true;
}
return false;
}
int locks_in_grace(struct net *net)
{
return __state_in_grace(net, 0);
}
EXPORT_SYMBOL_GPL(locks_in_grace);
int opens_in_grace(struct net *net)
{
return __state_in_grace(net, 1);
}
EXPORT_SYMBOL_GPL(opens_in_grace);
static int __net_init
grace_init_net(struct net *net)
{