Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c5e7615 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

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: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Tested-by: default avatarJeff Moyer <jmoyer@redhat.com>
parent b726e923

fs/lockd/svc.c

+1 −0
Original line number Diff line number Diff line
@@ -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();

fs/nfsd/nfs4state.c

+1 −0
Original line number Diff line number Diff line
@@ -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();