diff for duplicates of <566D7952.7090401@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index 2ad780b..7fe9b68 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,7 +42,7 @@ index da130f4..f3b4c30 100644 nrpages = CONFIG_READ_NRPAGES_INIT; pages = kcalloc(nrpages, sizeof(*pages), GFP_KERNEL); -- if (pages = NULL) { +- if (pages == NULL) { - rc = -ENOMEM; - goto out; - } @@ -55,18 +55,18 @@ index da130f4..f3b4c30 100644 for (i = 0; i < nrpages; i++) { pages[i] = alloc_page(GFP_KERNEL); @@ -1432,14 +1433,12 @@ out: - if (rc = 0 && !eof) + if (rc == 0 && !eof) goto again; - if (pages) { - for (i = 0; i < nrpages; i++) { -- if (pages[i] = NULL) +- if (pages[i] == NULL) - break; - __free_page(pages[i]); - } - kfree(pages); + for (i = 0; i < nrpages; i++) { -+ if (pages[i] = NULL) ++ if (pages[i] == NULL) + break; + __free_page(pages[i]); } diff --git a/a/content_digest b/N1/content_digest index 16461c5..22b7fcd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ "ref\0566ABCD9.1060404@users.sourceforge.net\0" "ref\0566D7733.1030102@users.sourceforge.net\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" - "Subject\0[PATCH 5/7] staging: lustre: Less checks in mgc_process_recover_log() after error detection\0" - "Date\0Sun, 13 Dec 2015 13:57:38 +0000\0" - "To\0Andreas Dilger <andreas.dilger@intel.com>" - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Oleg Drokin <oleg.drokin@intel.com> - lustre-devel@lists.lustre.org - " devel@driverdev.osuosl.org\0" - "Cc\0LKML <linux-kernel@vger.kernel.org>" - kernel-janitors@vger.kernel.org - " Julia Lawall <julia.lawall@lip6.fr>\0" + "Subject\0[lustre-devel] [PATCH 5/7] staging: lustre: Less checks in mgc_process_recover_log() after error detection\0" + "Date\0Sun, 13 Dec 2015 14:57:38 +0100\0" + "To\0lustre-devel@lists.lustre.org\0" "\00:1\0" "b\0" "From: Markus Elfring <elfring@users.sourceforge.net>\n" @@ -57,7 +50,7 @@ " \t\tnrpages = CONFIG_READ_NRPAGES_INIT;\n" " \n" " \tpages = kcalloc(nrpages, sizeof(*pages), GFP_KERNEL);\n" - "-\tif (pages = NULL) {\n" + "-\tif (pages == NULL) {\n" "-\t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "-\t}\n" @@ -70,18 +63,18 @@ " \tfor (i = 0; i < nrpages; i++) {\n" " \t\tpages[i] = alloc_page(GFP_KERNEL);\n" "@@ -1432,14 +1433,12 @@ out:\n" - " \tif (rc = 0 && !eof)\n" + " \tif (rc == 0 && !eof)\n" " \t\tgoto again;\n" " \n" "-\tif (pages) {\n" "-\t\tfor (i = 0; i < nrpages; i++) {\n" - "-\t\t\tif (pages[i] = NULL)\n" + "-\t\t\tif (pages[i] == NULL)\n" "-\t\t\t\tbreak;\n" "-\t\t\t__free_page(pages[i]);\n" "-\t\t}\n" "-\t\tkfree(pages);\n" "+\tfor (i = 0; i < nrpages; i++) {\n" - "+\t\tif (pages[i] = NULL)\n" + "+\t\tif (pages[i] == NULL)\n" "+\t\t\tbreak;\n" "+\t\t__free_page(pages[i]);\n" " \t}\n" @@ -92,4 +85,4 @@ "-- \n" 2.6.3 -b0f04aeeff56e8cec2309acabf05cfaf4150f351c62c1e453290259f2d8298a1 +bcc9bc86e6603d74e40258fdf5b90d409e4ef1c8e0f206275a02d49600ea24ab
diff --git a/a/1.txt b/N2/1.txt index 2ad780b..7fe9b68 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -42,7 +42,7 @@ index da130f4..f3b4c30 100644 nrpages = CONFIG_READ_NRPAGES_INIT; pages = kcalloc(nrpages, sizeof(*pages), GFP_KERNEL); -- if (pages = NULL) { +- if (pages == NULL) { - rc = -ENOMEM; - goto out; - } @@ -55,18 +55,18 @@ index da130f4..f3b4c30 100644 for (i = 0; i < nrpages; i++) { pages[i] = alloc_page(GFP_KERNEL); @@ -1432,14 +1433,12 @@ out: - if (rc = 0 && !eof) + if (rc == 0 && !eof) goto again; - if (pages) { - for (i = 0; i < nrpages; i++) { -- if (pages[i] = NULL) +- if (pages[i] == NULL) - break; - __free_page(pages[i]); - } - kfree(pages); + for (i = 0; i < nrpages; i++) { -+ if (pages[i] = NULL) ++ if (pages[i] == NULL) + break; + __free_page(pages[i]); } diff --git a/a/content_digest b/N2/content_digest index 16461c5..0774a39 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\0566D7733.1030102@users.sourceforge.net\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" "Subject\0[PATCH 5/7] staging: lustre: Less checks in mgc_process_recover_log() after error detection\0" - "Date\0Sun, 13 Dec 2015 13:57:38 +0000\0" + "Date\0Sun, 13 Dec 2015 14:57:38 +0100\0" "To\0Andreas Dilger <andreas.dilger@intel.com>" Greg Kroah-Hartman <gregkh@linuxfoundation.org> Oleg Drokin <oleg.drokin@intel.com> @@ -57,7 +57,7 @@ " \t\tnrpages = CONFIG_READ_NRPAGES_INIT;\n" " \n" " \tpages = kcalloc(nrpages, sizeof(*pages), GFP_KERNEL);\n" - "-\tif (pages = NULL) {\n" + "-\tif (pages == NULL) {\n" "-\t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "-\t}\n" @@ -70,18 +70,18 @@ " \tfor (i = 0; i < nrpages; i++) {\n" " \t\tpages[i] = alloc_page(GFP_KERNEL);\n" "@@ -1432,14 +1433,12 @@ out:\n" - " \tif (rc = 0 && !eof)\n" + " \tif (rc == 0 && !eof)\n" " \t\tgoto again;\n" " \n" "-\tif (pages) {\n" "-\t\tfor (i = 0; i < nrpages; i++) {\n" - "-\t\t\tif (pages[i] = NULL)\n" + "-\t\t\tif (pages[i] == NULL)\n" "-\t\t\t\tbreak;\n" "-\t\t\t__free_page(pages[i]);\n" "-\t\t}\n" "-\t\tkfree(pages);\n" "+\tfor (i = 0; i < nrpages; i++) {\n" - "+\t\tif (pages[i] = NULL)\n" + "+\t\tif (pages[i] == NULL)\n" "+\t\t\tbreak;\n" "+\t\t__free_page(pages[i]);\n" " \t}\n" @@ -92,4 +92,4 @@ "-- \n" 2.6.3 -b0f04aeeff56e8cec2309acabf05cfaf4150f351c62c1e453290259f2d8298a1 +036b7234849b9ca883399134c5b7fd7b6542f5c2257044eb95d77379622f584c
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.