mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-17 22:41:25 +00:00
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: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
parent
54a66e5480
commit
8fafa90082
@ -158,15 +158,9 @@ lockd(void *vrqstp)
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Retry any blocked locks that have been notified by
|
||||
* the VFS. Don't do this during grace period.
|
||||
* (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))
|
||||
timeout = nlmsvc_retry_blocked();
|
||||
|
||||
if (time_before(grace_period_expire, jiffies))
|
||||
clear_grace_period();
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user