diff for duplicates of <20180517095040.GC28396@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 4ab5de6..c93a184 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Wed, May 16, 2018 at 03:53:29PM -0400, J. Bruce Fields wrote: > 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. +> > > 4.4-stable review patch.��If anyone has any objections, please let me know. > > > > > > ------------------ > > > @@ -13,27 +13,27 @@ On Wed, May 16, 2018 at 03:53:29PM -0400, J. Bruce Fields wrote: > > > --- 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; +> > > �{ +> > > � 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(); +> > > � +> > > � /* 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(); +> > > � 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; -> > > } -> > > +> > > � 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); +> > > � 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); > > diff --git a/a/content_digest b/N1/content_digest index 9c44375..5e69b95 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -16,7 +16,7 @@ "On Wed, May 16, 2018 at 03:53:29PM -0400, J. Bruce Fields wrote:\n" "> On Tue, May 15, 2018 at 07:44:24PM +0100, Ben Hutchings wrote:\n" "> > On Wed, 2018-04-11 at 20:34 +0200, Greg Kroah-Hartman wrote:\n" - "> > > 4.4-stable review patch.\302\240\302\240If anyone has any objections, please let me know.\n" + "> > > 4.4-stable review patch.\303\257\302\277\302\275\303\257\302\277\302\275If anyone has any objections, please let me know.\n" "> > > \n" "> > > ------------------\n" "> > > \n" @@ -28,27 +28,27 @@ "> > > --- a/fs/lockd/svc.c\n" "> > > +++ b/fs/lockd/svc.c\n" "> > > @@ -129,6 +129,8 @@ lockd(void *vrqstp)\n" - "> > > \302\240{\n" - "> > > \302\240\tint\t\terr = 0;\n" - "> > > \302\240\tstruct svc_rqst *rqstp = vrqstp;\n" + "> > > \303\257\302\277\302\275{\n" + "> > > \303\257\302\277\302\275\tint\t\terr = 0;\n" + "> > > \303\257\302\277\302\275\tstruct svc_rqst *rqstp = vrqstp;\n" "> > > +\tstruct net *net = &init_net;\n" "> > > +\tstruct lockd_net *ln = net_generic(net, lockd_net_id);\n" - "> > > \302\240\n" - "> > > \302\240\t/* try_to_freeze() is called from svc_recv() */\n" - "> > > \302\240\tset_freezable();\n" + "> > > \303\257\302\277\302\275\n" + "> > > \303\257\302\277\302\275\t/* try_to_freeze() is called from svc_recv() */\n" + "> > > \303\257\302\277\302\275\tset_freezable();\n" "> > > @@ -173,6 +175,8 @@ lockd(void *vrqstp)\n" - "> > > \302\240\tif (nlmsvc_ops)\n" - "> > > \302\240\t\tnlmsvc_invalidate_all();\n" - "> > >\302\240\tnlm_shutdown_hosts();\n" + "> > > \303\257\302\277\302\275\tif (nlmsvc_ops)\n" + "> > > \303\257\302\277\302\275\t\tnlmsvc_invalidate_all();\n" + "> > >\303\257\302\277\302\275\tnlm_shutdown_hosts();\n" "> > > +\tcancel_delayed_work_sync(&ln->grace_period_end);\n" "> > > +\tlocks_end_grace(&ln->lockd_manager);\n" - "> > > \302\240\treturn 0;\n" - "> > > \302\240}\n" - "> > > \302\240\n" + "> > > \303\257\302\277\302\275\treturn 0;\n" + "> > > \303\257\302\277\302\275}\n" + "> > > \303\257\302\277\302\275\n" "> > > @@ -267,8 +271,6 @@ static void lockd_down_net(struct svc_se\n" - "> > > \302\240\tif (ln->nlmsvc_users) {\n" - "> > > \302\240\t\tif (--ln->nlmsvc_users == 0) {\n" - "> > > \302\240\t\t\tnlm_shutdown_hosts_net(net);\n" + "> > > \303\257\302\277\302\275\tif (ln->nlmsvc_users) {\n" + "> > > \303\257\302\277\302\275\t\tif (--ln->nlmsvc_users == 0) {\n" + "> > > \303\257\302\277\302\275\t\t\tnlm_shutdown_hosts_net(net);\n" "> > > -\t\t\tcancel_delayed_work_sync(&ln->grace_period_end);\n" "> > > -\t\t\tlocks_end_grace(&ln->lockd_manager);\n" "> > \n" @@ -61,4 +61,4 @@ "\n" greg k-h -9c79aff097fa778cea6434568dc2d08aa6f2fff7459ea3154e7b292422700722 +9e00022772993c56d317e21613964e8bf4090c901e4a2aff60bd81ef56d47972
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.