]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
lockd: fix lockd shutdown race
authorJ. Bruce Fields <bfields@redhat.com>
Wed, 29 Mar 2017 01:25:08 +0000 (21:25 -0400)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:36:23 +0000 (21:36 -0400)
commit888b81f1d9aabedc0cdc82bbc056f59308a22fdf
treede59d9955189056d03a66313e5e9d05594e44a96
parentb8ec219000746f9f90e63826127fc87fac7ace9a
lockd: fix lockd shutdown race

[ Upstream commit efda760fe95ea15291853c8fa9235c32d319cd98 ]

As reported by David Jeffery: "a signal was sent to lockd while lockd
was shutting down from a request to stop nfs.  The signal causes lockd
to call restart_grace() which puts the lockd_net structure on the grace
list.  If this signal is received at the wrong time, it will occur after
lockd_down_net() has called locks_end_grace() but before
lockd_down_net() stops the lockd thread.  This leads to lockd putting
the lockd_net structure back on the grace list, then exiting without
anything removing it from the list."

So, perform the final locks_end_grace() from the the lockd thread; this
ensures it's serialized with respect to restart_grace().

Reported-by: David Jeffery <djeffery@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
fs/lockd/svc.c