diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-03 16:40:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-03 16:40:37 -0800 |
commit | 2433c41789d6aa6797ca747707b7764e88e4fb6d (patch) | |
tree | a4f1706a1038bb8df671807c9ead0fa6abf9b4ed /fs/lockd/svc.c | |
parent | cd92a17eec752f8c948c4b6ab93dc099ce55b8cb (diff) | |
parent | a8d82d9b950213b66b22c9e7c63a058841de2394 (diff) |
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
NLM: client-side nlm_lookup_host() should avoid matching on srcaddr
nfsd: use of unitialized list head on error exit in nfs4recover.c
Add a reference to sunrpc in svc_addsock
nfsd: clean up grace period on early exit
Diffstat (limited to 'fs/lockd/svc.c')
-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 c631a83931c..56b076736b5 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(); |