diff for duplicates of <1488998288.2802.25.camel@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 6c2b668..4060713 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,8 +7,8 @@ On Wed, 2017-03-08 at 18:01 +0000, Trond Myklebust wrote: > > > > Signed-off-by: Jeff Layton <jlayton@redhat.com> > > --- -> > mm/truncate.c | 6 +++++- -> > 1 file changed, 5 insertions(+), 1 deletion(-) +> > A mm/truncate.c | 6 +++++- +> > A 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/mm/truncate.c b/mm/truncate.c > > index 6263affdef88..29ae420a5bf9 100644 @@ -16,24 +16,24 @@ On Wed, 2017-03-08 at 18:01 +0000, Trond Myklebust wrote: > > +++ b/mm/truncate.c > > @@ -594,11 +594,15 @@ invalidate_complete_page2(struct address_space > > *mapping, struct page *page) -> > -> > static int do_launder_page(struct address_space *mapping, struct +> > A +> > A static int do_launder_page(struct address_space *mapping, struct > > page *page) -> > { +> > A { > > + int ret; > > + -> > if (!PageDirty(page)) -> > return 0; -> > if (page->mapping != mapping || mapping->a_ops->launder_page +> > A if (!PageDirty(page)) +> > A return 0; +> > A if (page->mapping != mapping || mapping->a_ops->launder_page > > == NULL) -> > return 0; +> > A return 0; > > - return mapping->a_ops->launder_page(page); > > + ret = mapping->a_ops->launder_page(page); > > + mapping_set_error(mapping, ret); > > + return ret; -> > } -> > -> > /** +> > A } +> > A +> > A /** > > No. At that layer, you don't know that this is a page error. In the NFS > case, it could, for instance, just as well be a fatal signal. diff --git a/a/content_digest b/N1/content_digest index 8155ac2..b694748 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -29,8 +29,8 @@ "> > \n" "> > Signed-off-by: Jeff Layton <jlayton@redhat.com>\n" "> > ---\n" - "> > \302\240mm/truncate.c | 6 +++++-\n" - "> > \302\2401 file changed, 5 insertions(+), 1 deletion(-)\n" + "> > A mm/truncate.c | 6 +++++-\n" + "> > A 1 file changed, 5 insertions(+), 1 deletion(-)\n" "> > \n" "> > diff --git a/mm/truncate.c b/mm/truncate.c\n" "> > index 6263affdef88..29ae420a5bf9 100644\n" @@ -38,24 +38,24 @@ "> > +++ b/mm/truncate.c\n" "> > @@ -594,11 +594,15 @@ invalidate_complete_page2(struct address_space\n" "> > *mapping, struct page *page)\n" - "> > \302\240\n" - "> > \302\240static int do_launder_page(struct address_space *mapping, struct\n" + "> > A \n" + "> > A static int do_launder_page(struct address_space *mapping, struct\n" "> > page *page)\n" - "> > \302\240{\n" + "> > A {\n" "> > +\tint ret;\n" "> > +\n" - "> > \302\240\tif (!PageDirty(page))\n" - "> > \302\240\t\treturn 0;\n" - "> > \302\240\tif (page->mapping != mapping || mapping->a_ops->launder_page \n" + "> > A \tif (!PageDirty(page))\n" + "> > A \t\treturn 0;\n" + "> > A \tif (page->mapping != mapping || mapping->a_ops->launder_page \n" "> > == NULL)\n" - "> > \302\240\t\treturn 0;\n" + "> > A \t\treturn 0;\n" "> > -\treturn mapping->a_ops->launder_page(page);\n" "> > +\tret = mapping->a_ops->launder_page(page);\n" "> > +\tmapping_set_error(mapping, ret);\n" "> > +\treturn ret;\n" - "> > \302\240}\n" - "> > \302\240\n" - "> > \302\240/**\n" + "> > A }\n" + "> > A \n" + "> > A /**\n" "> \n" "> No. At that layer, you don't know that this is a page error. In the NFS\n" "> case, it could, for instance, just as well be a fatal signal.\n" @@ -82,4 +82,4 @@ "see: http://www.linux-mm.org/ .\n" "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -dbc11295e77ce17b1b43b8ea695a74bed66f89e2ee8cf345bea86533a0e51d50 +e49996ced10e560495d51c10929dedcc7a13b4817c37e9effcf855575c09d2bd
diff --git a/a/1.txt b/N2/1.txt index 6c2b668..eb423f4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -53,9 +53,3 @@ generic VFS code instead, but if not then I'll just plan to do that. Thanks, -- Jeff Layton <jlayton@redhat.com> - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index 8155ac2..22bbe07 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -74,12 +74,6 @@ "\n" "Thanks,\n" "-- \n" - "Jeff Layton <jlayton@redhat.com>\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + Jeff Layton <jlayton@redhat.com> -dbc11295e77ce17b1b43b8ea695a74bed66f89e2ee8cf345bea86533a0e51d50 +34458661301739308c7c28261479937edd474db5e3ed8a4e5afd280151106d30
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.