summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2008-01-24 11:11:34 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-09-29 17:56:59 -0400
commit8fafa90082ab18859d97627fc454edf12f7efbff (patch)
treede5bfb7c8381cf62dc9d6467e7becb08ebca8c7f /fs/lockd
parent54a66e548079f12a6f54c3cae96812a9ed9b54ae (diff)
downloadlinux-8fafa90082ab18859d97627fc454edf12f7efbff.tar.gz
linux-8fafa90082ab18859d97627fc454edf12f7efbff.tar.bz2
linux-8fafa90082ab18859d97627fc454edf12f7efbff.zip
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>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/svc.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 1553fecc567d..bdc607bb25e9 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -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();
/*