[143/158] mm/madvise.c: replace with page_size() in madvise_inject_error()

Commit Message

Andrew Morton Dec. 1, 2019, 1:57 a.m. UTC

From: Yunfeng Ye <[e-mail]>
Subject: mm/madvise.c: replace with page_size() in madvise_inject_error()

page_size() is supported after the commit a50b854e073c ("mm: introduce
page_size()").

Use page_size() in madvise_inject_error() for readability.

[[e-mail]: use ulong for `size', per David]
Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Yunfeng Ye <[e-mail]>
Reviewed-by: Andrew Morton <[e-mail]>
Acked-by: David Rientjes <[e-mail]>
Cc: Jason Gunthorpe <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Minchan Kim <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Jan Kara <[e-mail]>
Cc: Mike Rapoport <[e-mail]>
Cc: Hu Shiyuan <[e-mail]>
Cc: Feilong Lin <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/madvise.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

--- a/mm/madvise.c~mm-madvise-replace-with-page_size-in-madvise_inject_error
+++ a/mm/madvise.c
@@ -864,13 +864,13 @@  static int madvise_inject_error(int beha
 {
 	struct page *page;
 	struct zone *zone;
-	unsigned int order;
+	unsigned long size;
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
 
 
-	for (; start < end; start += PAGE_SIZE << order) {
+	for (; start < end; start += size) {
 		unsigned long pfn;
 		int ret;
 
@@ -882,9 +882,9 @@  static int madvise_inject_error(int beha
 		/*
 		 * When soft offlining hugepages, after migrating the page
 		 * we dissolve it, therefore in the second loop "page" will
-		 * no longer be a compound page, and order will be 0.
+		 * no longer be a compound page.
 		 */
-		order = compound_order(compound_head(page));
+		size = page_size(compound_head(page));
 
 		if (PageHWPoison(page)) {
 			put_page(page);