diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2015-08-06 12:47:02 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-08-13 10:22:06 -0400 |
| commit | c87fb4a378f93f114b9906e180d83877cee4e7f4 (patch) | |
| tree | 79af8260a9b9788247e37650fee5837799791723 /fs/lockd | |
| parent | 4bc6603778e473938ae815123b786e724084790c (diff) | |
| download | linux-stable-c87fb4a378f93f114b9906e180d83877cee4e7f4.tar.gz linux-stable-c87fb4a378f93f114b9906e180d83877cee4e7f4.tar.bz2 linux-stable-c87fb4a378f93f114b9906e180d83877cee4e7f4.zip | |
lockd: NLM grace period shouldn't block NFSv4 opens
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>
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/svc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 530914b5c455..d678bcc3cbcb 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -591,6 +591,7 @@ static int lockd_init_net(struct net *net) INIT_DELAYED_WORK(&ln->grace_period_end, grace_ender); INIT_LIST_HEAD(&ln->lockd_manager.list); + ln->lockd_manager.block_opens = false; spin_lock_init(&ln->nsm_clnt_lock); return 0; } |