summaryrefslogtreecommitdiff
path: root/fs/lockd/svc.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-16 21:04:48 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-12-16 21:04:48 (GMT)
commit78f902ccc597d6ce3e8d1477d70f2d79e960ba7a (patch)
treec6ceab663de16501d1dda1c1596fe2dacaaef8e3 /fs/lockd/svc.c
parent9ee670fd87b7d69c8633b94c42aadcbbcb96f28e (diff)
parent8b1fae4e4200388b64dd88065639413cb3f1051c (diff)
downloadlinux-fsl-qoriq-78f902ccc597d6ce3e8d1477d70f2d79e960ba7a.tar.xz
Merge commit 'v2.6.28-rc8' into x86/doc
Diffstat (limited to 'fs/lockd/svc.c')
-rw-r--r--fs/lockd/svc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index c631a83..56b07673 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -181,6 +181,7 @@ lockd(void *vrqstp)
}
flush_signals(current);
cancel_delayed_work_sync(&grace_period_end);
+ locks_end_grace(&lockd_manager);
if (nlmsvc_ops)
nlmsvc_invalidate_all();
nlm_shutdown_hosts();