Commit 8fafa900 authored by J. Bruce Fields's avatar J. Bruce Fields

locks: allow lockd to process blocked locks during grace period

The check here is currently harmless but unnecessary, since, as the
comment notes, there aren't any blocked-lock callbacks to process
during the grace period anyway.

And eventually we want to allow multiple grace periods that come and go
for different filesystems over the course of the lifetime of lockd, at
which point this check is just going to get in the way.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 54a66e54
...@@ -158,15 +158,9 @@ lockd(void *vrqstp) ...@@ -158,15 +158,9 @@ lockd(void *vrqstp)
continue; continue;
} }
/* timeout = nlmsvc_retry_blocked();
* Retry any blocked locks that have been notified by
* the VFS. Don't do this during grace period. if (time_before(grace_period_expire, jiffies))
* (Theoretically, there shouldn't even be blocked locks
* during grace period).
*/
if (!nlmsvc_grace_period) {
timeout = nlmsvc_retry_blocked();
} else if (time_before(grace_period_expire, jiffies))
clear_grace_period(); clear_grace_period();
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment