lkml.org 
[lkml]   [2018]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 4.4 014/190] lockd: fix lockd shutdown race
On Tue, May 15, 2018 at 07:44:24PM +0100, Ben Hutchings wrote:
> On Wed, 2018-04-11 at 20:34 +0200, Greg Kroah-Hartman wrote:
> > 4.4-stable review patch.  If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: "J. Bruce Fields" <bfields@redhat.com>
> >
> >
> > [ Upstream commit efda760fe95ea15291853c8fa9235c32d319cd98 ]
> [...]
> > --- a/fs/lockd/svc.c
> > +++ b/fs/lockd/svc.c
> > @@ -129,6 +129,8 @@ lockd(void *vrqstp)
> >  {
> >   int err = 0;
> >   struct svc_rqst *rqstp = vrqstp;
> > + struct net *net = &init_net;
> > + struct lockd_net *ln = net_generic(net, lockd_net_id);
> >  
> >   /* try_to_freeze() is called from svc_recv() */
> >   set_freezable();
> > @@ -173,6 +175,8 @@ lockd(void *vrqstp)
> >   if (nlmsvc_ops)
> >   nlmsvc_invalidate_all();
> >  nlm_shutdown_hosts();
> > + cancel_delayed_work_sync(&ln->grace_period_end);
> > + locks_end_grace(&ln->lockd_manager);
> >   return 0;
> >  }
> >  
> > @@ -267,8 +271,6 @@ static void lockd_down_net(struct svc_se
> >   if (ln->nlmsvc_users) {
> >   if (--ln->nlmsvc_users == 0) {
> >   nlm_shutdown_hosts_net(net);
> > - cancel_delayed_work_sync(&ln->grace_period_end);
> > - locks_end_grace(&ln->lockd_manager);
>
> Aren't these statements still needed for non-initial namespaces?

Looks like this this should be backported only if 3a2b19d1ee56 "lockd:
lost rollback of set_grace_period() in lockd_down_net()" is also.

--b.

\
 
 \ /
  Last update: 2018-05-16 21:54    [W:0.100 / U:0.660 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site