diff for duplicates of <20170722124630.GA6774@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 07028c6..23ba346 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Wed, Jul 19, 2017 at 06:39:13PM +0000, Pavel Shilovskiy wrote: > 2017-07-14 9:43 Ben Hutchings <ben@decadent.org.uk>: > > On Fri, 2017-05-05 at 11:32 -0700, Greg Kroah-Hartman wrote: -> > > 3.18-stable review patch. If anyone has any objections, please let me know. +> > > 3.18-stable review patch.��If anyone has any objections, please let me know. > > > > > > ------------------ > > > @@ -12,23 +12,23 @@ On Wed, Jul 19, 2017 at 06:39:13PM +0000, Pavel Shilovskiy wrote: > > > --- a/fs/cifs/smb2ops.c > > > +++ b/fs/cifs/smb2ops.c > > > @@ -1461,6 +1461,8 @@ struct smb_version_operations smb21_oper -> > > .clear_stats = smb2_clear_stats, -> > > .print_stats = smb2_print_stats, -> > > .is_oplock_break = smb2_is_valid_oplock_break, +> > > � .clear_stats = smb2_clear_stats, +> > > � .print_stats = smb2_print_stats, +> > > � .is_oplock_break = smb2_is_valid_oplock_break, > > > + .handle_cancelled_mid = smb2_handle_cancelled_mid, > > > + .handle_cancelled_mid = smb2_handle_cancelled_mid, -> > > .downgrade_oplock = smb2_downgrade_oplock, -> > > .need_neg = smb2_need_neg, -> > > .negotiate = smb2_negotiate, +> > > � .downgrade_oplock = smb2_downgrade_oplock, +> > > � .need_neg = smb2_need_neg, +> > > � .negotiate = smb2_negotiate, > > > @@ -1542,6 +1544,8 @@ struct smb_version_operations smb30_oper -> > > .print_stats = smb2_print_stats, -> > > .dump_share_caps = smb2_dump_share_caps, -> > > .is_oplock_break = smb2_is_valid_oplock_break, +> > > � .print_stats = smb2_print_stats, +> > > � .dump_share_caps = smb2_dump_share_caps, +> > > � .is_oplock_break = smb2_is_valid_oplock_break, > > > + .handle_cancelled_mid = smb2_handle_cancelled_mid, > > > + .handle_cancelled_mid = smb2_handle_cancelled_mid, -> > > .downgrade_oplock = smb2_downgrade_oplock, -> > > .need_neg = smb2_need_neg, -> > > .negotiate = smb2_negotiate, +> > > � .downgrade_oplock = smb2_downgrade_oplock, +> > > � .need_neg = smb2_need_neg, +> > > � .negotiate = smb2_negotiate, > > [...] > > > > This doesn't look right. handle_cancelled_mid should be initialised once in each of the 3 smb_version_operations structures, shouldn't it? diff --git a/a/content_digest b/N1/content_digest index 7d37d17..2693b4a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,7 +15,7 @@ "On Wed, Jul 19, 2017 at 06:39:13PM +0000, Pavel Shilovskiy wrote:\n" "> 2017-07-14 9:43 Ben Hutchings <ben@decadent.org.uk>:\n" "> > On Fri, 2017-05-05 at 11:32 -0700, Greg Kroah-Hartman wrote:\n" - "> > > 3.18-stable review patch.\302\240\302\240If anyone has any objections, please let me know.\n" + "> > > 3.18-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" @@ -26,23 +26,23 @@ "> > > --- a/fs/cifs/smb2ops.c\n" "> > > +++ b/fs/cifs/smb2ops.c\n" "> > > @@ -1461,6 +1461,8 @@ struct smb_version_operations smb21_oper\n" - "> > > \302\240\t.clear_stats = smb2_clear_stats,\n" - "> > > \302\240\t.print_stats = smb2_print_stats,\n" - "> > > \302\240\t.is_oplock_break = smb2_is_valid_oplock_break,\n" + "> > > \303\257\302\277\302\275\t.clear_stats = smb2_clear_stats,\n" + "> > > \303\257\302\277\302\275\t.print_stats = smb2_print_stats,\n" + "> > > \303\257\302\277\302\275\t.is_oplock_break = smb2_is_valid_oplock_break,\n" "> > > +\t.handle_cancelled_mid = smb2_handle_cancelled_mid,\n" "> > > +\t.handle_cancelled_mid = smb2_handle_cancelled_mid,\n" - "> > > \302\240\t.downgrade_oplock = smb2_downgrade_oplock,\n" - "> > > \302\240\t.need_neg = smb2_need_neg,\n" - "> > > \302\240\t.negotiate = smb2_negotiate,\n" + "> > > \303\257\302\277\302\275\t.downgrade_oplock = smb2_downgrade_oplock,\n" + "> > > \303\257\302\277\302\275\t.need_neg = smb2_need_neg,\n" + "> > > \303\257\302\277\302\275\t.negotiate = smb2_negotiate,\n" "> > > @@ -1542,6 +1544,8 @@ struct smb_version_operations smb30_oper\n" - "> > > \302\240\t.print_stats = smb2_print_stats,\n" - "> > > \302\240\t.dump_share_caps = smb2_dump_share_caps,\n" - "> > > \302\240\t.is_oplock_break = smb2_is_valid_oplock_break,\n" + "> > > \303\257\302\277\302\275\t.print_stats = smb2_print_stats,\n" + "> > > \303\257\302\277\302\275\t.dump_share_caps = smb2_dump_share_caps,\n" + "> > > \303\257\302\277\302\275\t.is_oplock_break = smb2_is_valid_oplock_break,\n" "> > > +\t.handle_cancelled_mid = smb2_handle_cancelled_mid,\n" "> > > +\t.handle_cancelled_mid = smb2_handle_cancelled_mid,\n" - "> > > \302\240\t.downgrade_oplock = smb2_downgrade_oplock,\n" - "> > > \302\240\t.need_neg = smb2_need_neg,\n" - "> > > \302\240\t.negotiate = smb2_negotiate,\n" + "> > > \303\257\302\277\302\275\t.downgrade_oplock = smb2_downgrade_oplock,\n" + "> > > \303\257\302\277\302\275\t.need_neg = smb2_need_neg,\n" + "> > > \303\257\302\277\302\275\t.negotiate = smb2_negotiate,\n" "> > [...]\n" "> > \n" "> > This doesn't look right. handle_cancelled_mid should be initialised once in each of the 3 smb_version_operations structures, shouldn't it?\n" @@ -59,4 +59,4 @@ "\n" greg k-h -2d4df3b8f95dd72a6771188df4a72bd61c2343cb3fe2ff48ff84a6eb5f2b3d51 +ac509c976a8d5cafa020db340091b9fa404bf7c2fc5748e2edf06793124bca4e
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.