diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-11-20 14:36:17 -0600 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-11-24 10:12:48 -0600 |
| commit | 2c5e76158fcea6e3b9536a74efa7b5e2e846d374 (patch) | |
| tree | dca1fcd75e3091b9ffe14b5461714fed1542dbba | |
| parent | b726e923ea4d216027e466aa602d914e4b4a63af (diff) | |
| download | kernel_goldelico_gta04-2c5e76158fcea6e3b9536a74efa7b5e2e846d374.zip kernel_goldelico_gta04-2c5e76158fcea6e3b9536a74efa7b5e2e846d374.tar.gz kernel_goldelico_gta04-2c5e76158fcea6e3b9536a74efa7b5e2e846d374.tar.bz2 | |
nfsd: clean up grace period on early exit
If nfsd was shut down before the grace period ended, we could end up
with a freed object still on grace_list. Thanks to Jeff Moyer for
reporting the resulting list corruption warnings.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Tested-by: Jeff Moyer <jmoyer@redhat.com>
| -rw-r--r-- | fs/lockd/svc.c | 1 | ||||
| -rw-r--r-- | fs/nfsd/nfs4state.c | 1 |
2 files changed, 2 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(); diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index b0bebc5..1a052ac 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3261,6 +3261,7 @@ nfs4_state_shutdown(void) { cancel_rearming_delayed_workqueue(laundry_wq, &laundromat_work); destroy_workqueue(laundry_wq); + locks_end_grace(&nfsd4_manager); nfs4_lock_state(); nfs4_release_reclaim(); __nfs4_state_shutdown(); |