diff for duplicates of <20160817020248.GE2031@devil.localdomain> diff --git a/a/1.txt b/N1/1.txt index 58f88f0..d795d72 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Tue, Aug 16, 2016 at 08:45:02PM +0100, Ben Hutchings wrote: > On Sun, 2016-08-14 at 09:36 +1000, Dave Chinner wrote: > > On Sat, Aug 13, 2016 at 06:42:51PM +0100, Ben Hutchings wrote: > > > -> > > 3.16.37-rc1 review patch. If anyone has any objections, please let me know. +> > > 3.16.37-rc1 review patch.��If anyone has any objections, please let me know. > > > > > > ------------------ > > > @@ -20,19 +20,19 @@ On Tue, Aug 16, 2016 at 08:45:02PM +0100, Ben Hutchings wrote: > > > the inode flush being aborted correctly. > > .... > > > -> > > -> > > > > /* -> > > > > - * Get the buffer containing the on-disk inode. -> > > > > + * Get the buffer containing the on-disk inode. We are doing a try-lock -> > > > > + * operation here, so we may get an EAGAIN error. In that case, we -> > > > > + * simply want to return with the inode still dirty. -> > > > > + * -> > > > > + * If we get any other error, we effectively have a corruption situation -> > > > > + * and we cannot flush the inode, so we treat it the same as failing -> > > > > + * xfs_iflush_int(). -> > > > > */ -> > > > > error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK, -> > > > > 0); +> > > � +> > > > > � /* +> > > > > - �* Get the buffer containing the on-disk inode. +> > > > > + �* Get the buffer containing the on-disk inode. We are doing a try-lock +> > > > > + �* operation here, so we may get��an EAGAIN error. In that case, we +> > > > > + �* simply want to return with the inode still dirty. +> > > > > + �* +> > > > > + �* If we get any other error, we effectively have a corruption situation +> > > > > + �* and we cannot flush the inode, so we treat it the same as failing +> > > > > + �* xfs_iflush_int(). +> > > > > � �*/ +> > > > > � error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK, +> > > > > � �������0); > > > > > - if (error || !bp) { > > > > > + if (error == -EAGAIN) { > > diff --git a/a/content_digest b/N1/content_digest index b2f5293..30306d0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -18,7 +18,7 @@ "> On Sun, 2016-08-14 at 09:36 +1000, Dave Chinner wrote:\n" "> > On Sat, Aug 13, 2016 at 06:42:51PM +0100, Ben Hutchings wrote:\n" "> > > \n" - "> > > 3.16.37-rc1 review patch.\302\240\302\240If anyone has any objections, please let me know.\n" + "> > > 3.16.37-rc1 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" @@ -36,19 +36,19 @@ "> > > the inode flush being aborted correctly.\n" "> > ....\n" "> > > \n" - "> > > \302\240\n" - "> > > > > \302\240\t/*\n" - "> > > > > -\t\302\240* Get the buffer containing the on-disk inode.\n" - "> > > > > +\t\302\240* Get the buffer containing the on-disk inode. We are doing a try-lock\n" - "> > > > > +\t\302\240* operation here, so we may get\302\240\302\240an EAGAIN error. In that case, we\n" - "> > > > > +\t\302\240* simply want to return with the inode still dirty.\n" - "> > > > > +\t\302\240*\n" - "> > > > > +\t\302\240* If we get any other error, we effectively have a corruption situation\n" - "> > > > > +\t\302\240* and we cannot flush the inode, so we treat it the same as failing\n" - "> > > > > +\t\302\240* xfs_iflush_int().\n" - "> > > > > \302\240\t\302\240*/\n" - "> > > > > \302\240\terror = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK,\n" - "> > > > > \302\240\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\2400);\n" + "> > > \303\257\302\277\302\275\n" + "> > > > > \303\257\302\277\302\275\t/*\n" + "> > > > > -\t\303\257\302\277\302\275* Get the buffer containing the on-disk inode.\n" + "> > > > > +\t\303\257\302\277\302\275* Get the buffer containing the on-disk inode. We are doing a try-lock\n" + "> > > > > +\t\303\257\302\277\302\275* operation here, so we may get\303\257\302\277\302\275\303\257\302\277\302\275an EAGAIN error. In that case, we\n" + "> > > > > +\t\303\257\302\277\302\275* simply want to return with the inode still dirty.\n" + "> > > > > +\t\303\257\302\277\302\275*\n" + "> > > > > +\t\303\257\302\277\302\275* If we get any other error, we effectively have a corruption situation\n" + "> > > > > +\t\303\257\302\277\302\275* and we cannot flush the inode, so we treat it the same as failing\n" + "> > > > > +\t\303\257\302\277\302\275* xfs_iflush_int().\n" + "> > > > > \303\257\302\277\302\275\t\303\257\302\277\302\275*/\n" + "> > > > > \303\257\302\277\302\275\terror = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK,\n" + "> > > > > \303\257\302\277\302\275\t\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\2750);\n" "> > > > > -\tif (error || !bp) {\n" "> > > > > +\tif (error == -EAGAIN) {\n" "> > \n" @@ -65,4 +65,4 @@ "Dave Chinner\n" dchinner@redhat.com -63393f52435ec27dcb512e351f3411b8a115baf6363e19b7e73b5e1f9a7a9817 +1c8d72c5cf54c274ab77eb6ba77da504861acc593534b37892f27e2bc10f8e10
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.