diff for duplicates of <566D7989.6090205@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index 8ba4d37..a937a8d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,7 @@ index f3b4c30..7048722 100644 - for (i = 0; i < nrpages; i++) { pages[i] = alloc_page(GFP_KERNEL); - if (pages[i] = NULL) { + if (pages[i] == NULL) { rc = -ENOMEM; - goto out; + goto free_pages; @@ -46,7 +46,7 @@ index f3b4c30..7048722 100644 LASSERT(mutex_is_locked(&cld->cld_lock)); @@ -1330,12 +1328,12 @@ again: &RQF_MGS_CONFIG_READ); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto free_pages; @@ -70,7 +70,7 @@ index f3b4c30..7048722 100644 body->mcb_type = cld->cld_type; @@ -1356,7 +1354,7 @@ again: MGS_BULK_PORTAL); - if (desc = NULL) { + if (desc == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -106,7 +106,7 @@ index f3b4c30..7048722 100644 + goto finish_request; } - if (ealen = 0) { /* no logs transferred */ + if (ealen == 0) { /* no logs transferred */ if (!eof) rc = -EINVAL; - goto out; @@ -125,12 +125,12 @@ index f3b4c30..7048722 100644 +finish_request: + ptlrpc_req_finished(req); - if (rc = 0 && !eof) + if (rc == 0 && !eof) goto again; - +free_pages: for (i = 0; i < nrpages; i++) { - if (pages[i] = NULL) + if (pages[i] == NULL) break; -- 2.6.3 diff --git a/a/content_digest b/N1/content_digest index 18da4e6..2f36829 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 6/7] staging: lustre: A few checks less in mgc_process_recover_log() after error detection\0" - "Date\0Sun, 13 Dec 2015 13:58:33 +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 6/7] staging: lustre: A few checks less in mgc_process_recover_log() after error detection\0" + "Date\0Sun, 13 Dec 2015 14:58:33 +0100\0" + "To\0lustre-devel@lists.lustre.org\0" "\00:1\0" "b\0" "From: Markus Elfring <elfring@users.sourceforge.net>\n" @@ -48,7 +41,7 @@ "-\n" " \tfor (i = 0; i < nrpages; i++) {\n" " \t\tpages[i] = alloc_page(GFP_KERNEL);\n" - " \t\tif (pages[i] = NULL) {\n" + " \t\tif (pages[i] == NULL) {\n" " \t\t\trc = -ENOMEM;\n" "-\t\t\tgoto out;\n" "+\t\t\tgoto free_pages;\n" @@ -61,7 +54,7 @@ " \tLASSERT(mutex_is_locked(&cld->cld_lock));\n" "@@ -1330,12 +1328,12 @@ again:\n" " \t\t\t\t &RQF_MGS_CONFIG_READ);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto free_pages;\n" @@ -85,7 +78,7 @@ " \tbody->mcb_type = cld->cld_type;\n" "@@ -1356,7 +1354,7 @@ again:\n" " \t\t\t\t MGS_BULK_PORTAL);\n" - " \tif (desc = NULL) {\n" + " \tif (desc == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -121,7 +114,7 @@ "+\t\tgoto finish_request;\n" " \t}\n" " \n" - " \tif (ealen = 0) { /* no logs transferred */\n" + " \tif (ealen == 0) { /* no logs transferred */\n" " \t\tif (!eof)\n" " \t\t\trc = -EINVAL;\n" "-\t\tgoto out;\n" @@ -140,14 +133,14 @@ "+finish_request:\n" "+\tptlrpc_req_finished(req);\n" " \n" - " \tif (rc = 0 && !eof)\n" + " \tif (rc == 0 && !eof)\n" " \t\tgoto again;\n" "-\n" "+free_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" "-- \n" 2.6.3 -77da6d792be4e734d00c78a4ee88db0775429f55d85f962d56b9d3929e24445c +a67dbb0074da00ee90478e097d514a5142a478da037323d85832bd8c5a2c669e
diff --git a/a/1.txt b/N2/1.txt index 8ba4d37..a937a8d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -33,7 +33,7 @@ index f3b4c30..7048722 100644 - for (i = 0; i < nrpages; i++) { pages[i] = alloc_page(GFP_KERNEL); - if (pages[i] = NULL) { + if (pages[i] == NULL) { rc = -ENOMEM; - goto out; + goto free_pages; @@ -46,7 +46,7 @@ index f3b4c30..7048722 100644 LASSERT(mutex_is_locked(&cld->cld_lock)); @@ -1330,12 +1328,12 @@ again: &RQF_MGS_CONFIG_READ); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto free_pages; @@ -70,7 +70,7 @@ index f3b4c30..7048722 100644 body->mcb_type = cld->cld_type; @@ -1356,7 +1354,7 @@ again: MGS_BULK_PORTAL); - if (desc = NULL) { + if (desc == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -106,7 +106,7 @@ index f3b4c30..7048722 100644 + goto finish_request; } - if (ealen = 0) { /* no logs transferred */ + if (ealen == 0) { /* no logs transferred */ if (!eof) rc = -EINVAL; - goto out; @@ -125,12 +125,12 @@ index f3b4c30..7048722 100644 +finish_request: + ptlrpc_req_finished(req); - if (rc = 0 && !eof) + if (rc == 0 && !eof) goto again; - +free_pages: for (i = 0; i < nrpages; i++) { - if (pages[i] = NULL) + if (pages[i] == NULL) break; -- 2.6.3 diff --git a/a/content_digest b/N2/content_digest index 18da4e6..fafd46c 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 6/7] staging: lustre: A few checks less in mgc_process_recover_log() after error detection\0" - "Date\0Sun, 13 Dec 2015 13:58:33 +0000\0" + "Date\0Sun, 13 Dec 2015 14:58:33 +0100\0" "To\0Andreas Dilger <andreas.dilger@intel.com>" Greg Kroah-Hartman <gregkh@linuxfoundation.org> Oleg Drokin <oleg.drokin@intel.com> @@ -48,7 +48,7 @@ "-\n" " \tfor (i = 0; i < nrpages; i++) {\n" " \t\tpages[i] = alloc_page(GFP_KERNEL);\n" - " \t\tif (pages[i] = NULL) {\n" + " \t\tif (pages[i] == NULL) {\n" " \t\t\trc = -ENOMEM;\n" "-\t\t\tgoto out;\n" "+\t\t\tgoto free_pages;\n" @@ -61,7 +61,7 @@ " \tLASSERT(mutex_is_locked(&cld->cld_lock));\n" "@@ -1330,12 +1328,12 @@ again:\n" " \t\t\t\t &RQF_MGS_CONFIG_READ);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto free_pages;\n" @@ -85,7 +85,7 @@ " \tbody->mcb_type = cld->cld_type;\n" "@@ -1356,7 +1354,7 @@ again:\n" " \t\t\t\t MGS_BULK_PORTAL);\n" - " \tif (desc = NULL) {\n" + " \tif (desc == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -121,7 +121,7 @@ "+\t\tgoto finish_request;\n" " \t}\n" " \n" - " \tif (ealen = 0) { /* no logs transferred */\n" + " \tif (ealen == 0) { /* no logs transferred */\n" " \t\tif (!eof)\n" " \t\t\trc = -EINVAL;\n" "-\t\tgoto out;\n" @@ -140,14 +140,14 @@ "+finish_request:\n" "+\tptlrpc_req_finished(req);\n" " \n" - " \tif (rc = 0 && !eof)\n" + " \tif (rc == 0 && !eof)\n" " \t\tgoto again;\n" "-\n" "+free_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" "-- \n" 2.6.3 -77da6d792be4e734d00c78a4ee88db0775429f55d85f962d56b9d3929e24445c +bd03f072037230aa010f367236f6d500d2b917deb1c1c6c0a17fa74421d29043
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.