diff for duplicates of <20120226084403.GA4641@dcvr.yhbt.net> diff --git a/a/1.txt b/N1/1.txt index ba650eb..bc79712 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,29 +4,29 @@ Hillf Danton <dhillf@gmail.com> wrote: > > --- a/mm/fadvise.c > > +++ b/mm/fadvise.c > > @@ -43,13 +43,13 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice) -> > A A A A A A A A goto out; -> > A A A A } +> > goto out; +> > } > > -> > - A A A mapping = file->f_mapping; -> > - A A A if (!mapping || len < 0) { -> > + A A A if (len < 0) { +> > - mapping = file->f_mapping; +> > - if (!mapping || len < 0) { +> > + if (len < 0) { > > Current code makes sure mapping is valid after the above check, Right. I moved the !mapping check down a few lines. -> > A A A A A A A A ret = -EINVAL; -> > A A A A A A A A goto out; -> > A A A A } +> > ret = -EINVAL; +> > goto out; +> > } Now the check hits the "goto out" the get_xip_mem check hits: -> > - A A A if (mapping->a_ops->get_xip_mem) { -> > + A A A mapping = file->f_mapping; -> > + A A A if (!mapping || mapping->a_ops->get_xip_mem) { -> > A A A A A A A A switch (advice) { -> > A A A A A A A A case POSIX_FADV_NORMAL: -> > A A A A A A A A case POSIX_FADV_RANDOM: +> > - if (mapping->a_ops->get_xip_mem) { +> > + mapping = file->f_mapping; +> > + if (!mapping || mapping->a_ops->get_xip_mem) { +> > switch (advice) { +> > case POSIX_FADV_NORMAL: +> > case POSIX_FADV_RANDOM: case POSIX_FADV_SEQUENTIAL: case POSIX_FADV_WILLNEED: @@ -53,10 +53,3 @@ out: fput(file); return ret; } - --- -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/ . -Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 55be241..942a7e6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,29 +15,29 @@ "> > --- a/mm/fadvise.c\n" "> > +++ b/mm/fadvise.c\n" "> > @@ -43,13 +43,13 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)\n" - "> > A A A A A A A A goto out;\n" - "> > A A A A }\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240goto out;\n" + "> > \302\240 \302\240 \302\240 \302\240}\n" "> >\n" - "> > - A A A mapping = file->f_mapping;\n" - "> > - A A A if (!mapping || len < 0) {\n" - "> > + A A A if (len < 0) {\n" + "> > - \302\240 \302\240 \302\240 mapping = file->f_mapping;\n" + "> > - \302\240 \302\240 \302\240 if (!mapping || len < 0) {\n" + "> > + \302\240 \302\240 \302\240 if (len < 0) {\n" "> \n" "> Current code makes sure mapping is valid after the above check,\n" "\n" "Right. I moved the !mapping check down a few lines.\n" "\n" - "> > A A A A A A A A ret = -EINVAL;\n" - "> > A A A A A A A A goto out;\n" - "> > A A A A }\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240ret = -EINVAL;\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240goto out;\n" + "> > \302\240 \302\240 \302\240 \302\240}\n" "\n" "Now the check hits the \"goto out\" the get_xip_mem check hits:\n" "\n" - "> > - A A A if (mapping->a_ops->get_xip_mem) {\n" - "> > + A A A mapping = file->f_mapping;\n" - "> > + A A A if (!mapping || mapping->a_ops->get_xip_mem) {\n" - "> > A A A A A A A A switch (advice) {\n" - "> > A A A A A A A A case POSIX_FADV_NORMAL:\n" - "> > A A A A A A A A case POSIX_FADV_RANDOM:\n" + "> > - \302\240 \302\240 \302\240 if (mapping->a_ops->get_xip_mem) {\n" + "> > + \302\240 \302\240 \302\240 mapping = file->f_mapping;\n" + "> > + \302\240 \302\240 \302\240 if (!mapping || mapping->a_ops->get_xip_mem) {\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240switch (advice) {\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240case POSIX_FADV_NORMAL:\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240case POSIX_FADV_RANDOM:\n" "\n" "\t\tcase POSIX_FADV_SEQUENTIAL:\n" "\t\tcase POSIX_FADV_WILLNEED:\n" @@ -63,13 +63,6 @@ "out:\n" "\tfput(file);\n" "\treturn ret;\n" - "}\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" - "Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + } -65d1ab56669a78331bbd69416b8e03815b82f5184505ab318d79b1bb5110c5c5 +2c939871ed424f63c1cd755ac4b088bc0d05f9743ccaef4e9debe331655b0d48
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.