diff for duplicates of <55BA822B.3020508@suse.cz> diff --git a/a/1.txt b/N1/1.txt index 1745c03..872ffa8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ Subject: [PATCH v3 1/3] mm: rename alloc_pages_exact_node to The function alloc_pages_exact_node() was introduced in 6484eb3e2a81 ("page allocator: do not check NUMA node ID when the caller knows the node is valid") as an optimized variant of alloc_pages_node(), that doesn't fallback to current -node for nid = NUMA_NO_NODE. Unfortunately the name of the function can easily +node for nid == NUMA_NO_NODE. Unfortunately the name of the function can easily suggest that the allocation is restricted to the given node and fails otherwise. In truth, the node is only preferred, unless __GFP_THISNODE is passed among the gfp flags. @@ -121,7 +121,7 @@ index 344387a..a6d6190 100644 - int node = ioc->node; struct page *page; -- if (node = NUMA_NO_NODE) +- if (node == NUMA_NO_NODE) - node = numa_node_id(); - - page = alloc_pages_exact_node(node, flags, get_order(size)); @@ -193,7 +193,7 @@ index 95c8944..340b44d 100644 + page = __alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE, pg_order); - if (page = NULL) { + if (page == NULL) { diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 3bd64b1..d2c142b 100644 --- a/include/linux/gfp.h @@ -221,7 +221,7 @@ index 3bd64b1..d2c142b 100644 -static inline struct page *alloc_pages_exact_node(int nid, gfp_t gfp_mask, +/* -+ * Allocate pages, preferring the node given as nid. When nid = NUMA_NO_NODE, ++ * Allocate pages, preferring the node given as nid. When nid == NUMA_NO_NODE, + * prefer the current CPU's node. + */ +static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask, @@ -450,7 +450,7 @@ index 257283f..b48ad97 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1336,7 +1336,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, - if (node = NUMA_NO_NODE) + if (node == NUMA_NO_NODE) page = alloc_pages(flags, order); else - page = alloc_pages_exact_node(node, flags, order); diff --git a/a/content_digest b/N1/content_digest index 4be462a..89b4001 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0alpine.DEB.2.11.1507301255380.5521@east.gentwo.org\0" "From\0Vlastimil Babka <vbabka@suse.cz>\0" "Subject\0Re: [PATCH v3 1/3] mm: rename alloc_pages_exact_node to __alloc_pages_node\0" - "Date\0Thu, 30 Jul 2015 19:59:39 +0000\0" + "Date\0Thu, 30 Jul 2015 21:59:39 +0200\0" "To\0Christoph Lameter <cl@linux.com>\0" "Cc\0linux-mm@kvack.org" Andrew Morton <akpm@linux-foundation.org> @@ -66,7 +66,7 @@ "The function alloc_pages_exact_node() was introduced in 6484eb3e2a81 (\"page\n" "allocator: do not check NUMA node ID when the caller knows the node is valid\")\n" "as an optimized variant of alloc_pages_node(), that doesn't fallback to current\n" - "node for nid = NUMA_NO_NODE. Unfortunately the name of the function can easily\n" + "node for nid == NUMA_NO_NODE. Unfortunately the name of the function can easily\n" "suggest that the allocation is restricted to the given node and fails\n" "otherwise. In truth, the node is only preferred, unless __GFP_THISNODE is\n" "passed among the gfp flags.\n" @@ -157,7 +157,7 @@ "-\t\tint node = ioc->node;\n" " \t\tstruct page *page;\n" " \n" - "-\t\tif (node = NUMA_NO_NODE)\n" + "-\t\tif (node == NUMA_NO_NODE)\n" "-\t\t\tnode = numa_node_id();\n" "-\n" "-\t\tpage = alloc_pages_exact_node(node, flags, get_order(size));\n" @@ -229,7 +229,7 @@ "+\tpage = __alloc_pages_node(nid,\n" " \t\t\t\t GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE,\n" " \t\t\t\t pg_order);\n" - " \tif (page = NULL) {\n" + " \tif (page == NULL) {\n" "diff --git a/include/linux/gfp.h b/include/linux/gfp.h\n" "index 3bd64b1..d2c142b 100644\n" "--- a/include/linux/gfp.h\n" @@ -257,7 +257,7 @@ " \n" "-static inline struct page *alloc_pages_exact_node(int nid, gfp_t gfp_mask,\n" "+/*\n" - "+ * Allocate pages, preferring the node given as nid. When nid = NUMA_NO_NODE,\n" + "+ * Allocate pages, preferring the node given as nid. When nid == NUMA_NO_NODE,\n" "+ * prefer the current CPU's node.\n" "+ */\n" "+static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,\n" @@ -486,7 +486,7 @@ "--- a/mm/slub.c\n" "+++ b/mm/slub.c\n" "@@ -1336,7 +1336,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s,\n" - " \tif (node = NUMA_NO_NODE)\n" + " \tif (node == NUMA_NO_NODE)\n" " \t\tpage = alloc_pages(flags, order);\n" " \telse\n" "-\t\tpage = alloc_pages_exact_node(node, flags, order);\n" @@ -497,4 +497,4 @@ "-- \n" 2.4.6 -67f87c80624d069ab98c3acb03eff8b40d10a51ad36532d4c959686c70eeeaf4 +964e9e3f01b35a9c9e9a44095515182fed6be211c3ae7d14e6f39b2117bd7b02
diff --git a/a/1.txt b/N2/1.txt index 1745c03..eff5d5a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -30,7 +30,7 @@ Subject: [PATCH v3 1/3] mm: rename alloc_pages_exact_node to The function alloc_pages_exact_node() was introduced in 6484eb3e2a81 ("page allocator: do not check NUMA node ID when the caller knows the node is valid") as an optimized variant of alloc_pages_node(), that doesn't fallback to current -node for nid = NUMA_NO_NODE. Unfortunately the name of the function can easily +node for nid == NUMA_NO_NODE. Unfortunately the name of the function can easily suggest that the allocation is restricted to the given node and fails otherwise. In truth, the node is only preferred, unless __GFP_THISNODE is passed among the gfp flags. @@ -121,7 +121,7 @@ index 344387a..a6d6190 100644 - int node = ioc->node; struct page *page; -- if (node = NUMA_NO_NODE) +- if (node == NUMA_NO_NODE) - node = numa_node_id(); - - page = alloc_pages_exact_node(node, flags, get_order(size)); @@ -193,7 +193,7 @@ index 95c8944..340b44d 100644 + page = __alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE, pg_order); - if (page = NULL) { + if (page == NULL) { diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 3bd64b1..d2c142b 100644 --- a/include/linux/gfp.h @@ -221,7 +221,7 @@ index 3bd64b1..d2c142b 100644 -static inline struct page *alloc_pages_exact_node(int nid, gfp_t gfp_mask, +/* -+ * Allocate pages, preferring the node given as nid. When nid = NUMA_NO_NODE, ++ * Allocate pages, preferring the node given as nid. When nid == NUMA_NO_NODE, + * prefer the current CPU's node. + */ +static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask, @@ -450,7 +450,7 @@ index 257283f..b48ad97 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1336,7 +1336,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, - if (node = NUMA_NO_NODE) + if (node == NUMA_NO_NODE) page = alloc_pages(flags, order); else - page = alloc_pages_exact_node(node, flags, order); @@ -460,3 +460,10 @@ index 257283f..b48ad97 100644 memcg_uncharge_slab(s, order); -- 2.4.6 + + +-- +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 4be462a..6c305e1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\0alpine.DEB.2.11.1507301255380.5521@east.gentwo.org\0" "From\0Vlastimil Babka <vbabka@suse.cz>\0" "Subject\0Re: [PATCH v3 1/3] mm: rename alloc_pages_exact_node to __alloc_pages_node\0" - "Date\0Thu, 30 Jul 2015 19:59:39 +0000\0" + "Date\0Thu, 30 Jul 2015 21:59:39 +0200\0" "To\0Christoph Lameter <cl@linux.com>\0" "Cc\0linux-mm@kvack.org" Andrew Morton <akpm@linux-foundation.org> @@ -29,9 +29,7 @@ Thomas Gleixner <tglx@linutronix.de> Ingo Molnar <mingo@redhat.com> H. Peter Anvin <hpa@zytor.com> - Cliff Whickman <cpw@sgi.com> - Michael Ellerman <mpe@ellerman.id.au> - " Robin Holt <robinmholt@gmail.com>\0" + " Cliff Whi\0" "\00:1\0" "b\0" "On 07/30/2015 07:58 PM, Christoph Lameter wrote:\n" @@ -66,7 +64,7 @@ "The function alloc_pages_exact_node() was introduced in 6484eb3e2a81 (\"page\n" "allocator: do not check NUMA node ID when the caller knows the node is valid\")\n" "as an optimized variant of alloc_pages_node(), that doesn't fallback to current\n" - "node for nid = NUMA_NO_NODE. Unfortunately the name of the function can easily\n" + "node for nid == NUMA_NO_NODE. Unfortunately the name of the function can easily\n" "suggest that the allocation is restricted to the given node and fails\n" "otherwise. In truth, the node is only preferred, unless __GFP_THISNODE is\n" "passed among the gfp flags.\n" @@ -157,7 +155,7 @@ "-\t\tint node = ioc->node;\n" " \t\tstruct page *page;\n" " \n" - "-\t\tif (node = NUMA_NO_NODE)\n" + "-\t\tif (node == NUMA_NO_NODE)\n" "-\t\t\tnode = numa_node_id();\n" "-\n" "-\t\tpage = alloc_pages_exact_node(node, flags, get_order(size));\n" @@ -229,7 +227,7 @@ "+\tpage = __alloc_pages_node(nid,\n" " \t\t\t\t GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE,\n" " \t\t\t\t pg_order);\n" - " \tif (page = NULL) {\n" + " \tif (page == NULL) {\n" "diff --git a/include/linux/gfp.h b/include/linux/gfp.h\n" "index 3bd64b1..d2c142b 100644\n" "--- a/include/linux/gfp.h\n" @@ -257,7 +255,7 @@ " \n" "-static inline struct page *alloc_pages_exact_node(int nid, gfp_t gfp_mask,\n" "+/*\n" - "+ * Allocate pages, preferring the node given as nid. When nid = NUMA_NO_NODE,\n" + "+ * Allocate pages, preferring the node given as nid. When nid == NUMA_NO_NODE,\n" "+ * prefer the current CPU's node.\n" "+ */\n" "+static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,\n" @@ -486,7 +484,7 @@ "--- a/mm/slub.c\n" "+++ b/mm/slub.c\n" "@@ -1336,7 +1336,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s,\n" - " \tif (node = NUMA_NO_NODE)\n" + " \tif (node == NUMA_NO_NODE)\n" " \t\tpage = alloc_pages(flags, order);\n" " \telse\n" "-\t\tpage = alloc_pages_exact_node(node, flags, order);\n" @@ -495,6 +493,13 @@ " \tif (!page)\n" " \t\tmemcg_uncharge_slab(s, order);\n" "-- \n" - 2.4.6 + "2.4.6\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" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -67f87c80624d069ab98c3acb03eff8b40d10a51ad36532d4c959686c70eeeaf4 +4b8b71eecae40616a73da31c465f79a574f5ab48c16e7f7b1cc46c1ae36b1ba8
diff --git a/a/1.txt b/N3/1.txt index 1745c03..eff5d5a 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -30,7 +30,7 @@ Subject: [PATCH v3 1/3] mm: rename alloc_pages_exact_node to The function alloc_pages_exact_node() was introduced in 6484eb3e2a81 ("page allocator: do not check NUMA node ID when the caller knows the node is valid") as an optimized variant of alloc_pages_node(), that doesn't fallback to current -node for nid = NUMA_NO_NODE. Unfortunately the name of the function can easily +node for nid == NUMA_NO_NODE. Unfortunately the name of the function can easily suggest that the allocation is restricted to the given node and fails otherwise. In truth, the node is only preferred, unless __GFP_THISNODE is passed among the gfp flags. @@ -121,7 +121,7 @@ index 344387a..a6d6190 100644 - int node = ioc->node; struct page *page; -- if (node = NUMA_NO_NODE) +- if (node == NUMA_NO_NODE) - node = numa_node_id(); - - page = alloc_pages_exact_node(node, flags, get_order(size)); @@ -193,7 +193,7 @@ index 95c8944..340b44d 100644 + page = __alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE, pg_order); - if (page = NULL) { + if (page == NULL) { diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 3bd64b1..d2c142b 100644 --- a/include/linux/gfp.h @@ -221,7 +221,7 @@ index 3bd64b1..d2c142b 100644 -static inline struct page *alloc_pages_exact_node(int nid, gfp_t gfp_mask, +/* -+ * Allocate pages, preferring the node given as nid. When nid = NUMA_NO_NODE, ++ * Allocate pages, preferring the node given as nid. When nid == NUMA_NO_NODE, + * prefer the current CPU's node. + */ +static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask, @@ -450,7 +450,7 @@ index 257283f..b48ad97 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1336,7 +1336,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, - if (node = NUMA_NO_NODE) + if (node == NUMA_NO_NODE) page = alloc_pages(flags, order); else - page = alloc_pages_exact_node(node, flags, order); @@ -460,3 +460,10 @@ index 257283f..b48ad97 100644 memcg_uncharge_slab(s, order); -- 2.4.6 + + +-- +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/N3/content_digest index 4be462a..d55860f 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,7 +2,7 @@ "ref\0alpine.DEB.2.11.1507301255380.5521@east.gentwo.org\0" "From\0Vlastimil Babka <vbabka@suse.cz>\0" "Subject\0Re: [PATCH v3 1/3] mm: rename alloc_pages_exact_node to __alloc_pages_node\0" - "Date\0Thu, 30 Jul 2015 19:59:39 +0000\0" + "Date\0Thu, 30 Jul 2015 21:59:39 +0200\0" "To\0Christoph Lameter <cl@linux.com>\0" "Cc\0linux-mm@kvack.org" Andrew Morton <akpm@linux-foundation.org> @@ -66,7 +66,7 @@ "The function alloc_pages_exact_node() was introduced in 6484eb3e2a81 (\"page\n" "allocator: do not check NUMA node ID when the caller knows the node is valid\")\n" "as an optimized variant of alloc_pages_node(), that doesn't fallback to current\n" - "node for nid = NUMA_NO_NODE. Unfortunately the name of the function can easily\n" + "node for nid == NUMA_NO_NODE. Unfortunately the name of the function can easily\n" "suggest that the allocation is restricted to the given node and fails\n" "otherwise. In truth, the node is only preferred, unless __GFP_THISNODE is\n" "passed among the gfp flags.\n" @@ -157,7 +157,7 @@ "-\t\tint node = ioc->node;\n" " \t\tstruct page *page;\n" " \n" - "-\t\tif (node = NUMA_NO_NODE)\n" + "-\t\tif (node == NUMA_NO_NODE)\n" "-\t\t\tnode = numa_node_id();\n" "-\n" "-\t\tpage = alloc_pages_exact_node(node, flags, get_order(size));\n" @@ -229,7 +229,7 @@ "+\tpage = __alloc_pages_node(nid,\n" " \t\t\t\t GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE,\n" " \t\t\t\t pg_order);\n" - " \tif (page = NULL) {\n" + " \tif (page == NULL) {\n" "diff --git a/include/linux/gfp.h b/include/linux/gfp.h\n" "index 3bd64b1..d2c142b 100644\n" "--- a/include/linux/gfp.h\n" @@ -257,7 +257,7 @@ " \n" "-static inline struct page *alloc_pages_exact_node(int nid, gfp_t gfp_mask,\n" "+/*\n" - "+ * Allocate pages, preferring the node given as nid. When nid = NUMA_NO_NODE,\n" + "+ * Allocate pages, preferring the node given as nid. When nid == NUMA_NO_NODE,\n" "+ * prefer the current CPU's node.\n" "+ */\n" "+static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,\n" @@ -486,7 +486,7 @@ "--- a/mm/slub.c\n" "+++ b/mm/slub.c\n" "@@ -1336,7 +1336,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s,\n" - " \tif (node = NUMA_NO_NODE)\n" + " \tif (node == NUMA_NO_NODE)\n" " \t\tpage = alloc_pages(flags, order);\n" " \telse\n" "-\t\tpage = alloc_pages_exact_node(node, flags, order);\n" @@ -495,6 +495,13 @@ " \tif (!page)\n" " \t\tmemcg_uncharge_slab(s, order);\n" "-- \n" - 2.4.6 + "2.4.6\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" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -67f87c80624d069ab98c3acb03eff8b40d10a51ad36532d4c959686c70eeeaf4 +1bb9dfc65c465f266e27c764c8be7b8460f6cd96995930697cebd04828d04c41
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.