page-read: Fix maybe_read_page to accept nr

Most of the rest code uses int nr, so ... Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com> Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
eabatalov · Dec 22, 2016 · a48c533 · a48c533
1 parent 215d242
commit a48c533
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/criu/pagemap.c b/criu/pagemap.c
@@ -353,9 +353,10 @@ static int enqueue_async_page(struct page_read *pr, unsigned long vaddr,
 }
 
 static int maybe_read_page(struct page_read *pr, unsigned long vaddr,
-			   unsigned long len, void *buf, unsigned flags)
+		int nr, void *buf, unsigned flags)
 {
 	int ret;
+	unsigned long len = nr * PAGE_SIZE;
 
 	if (flags & PR_ASYNC)
 		ret = enqueue_async_page(pr, vaddr, len, buf);
@@ -370,20 +371,18 @@ static int maybe_read_page(struct page_read *pr, unsigned long vaddr,
 static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, int nr,
 			     void *buf, unsigned flags)
 {
-	unsigned long len = nr * PAGE_SIZE;
-
 	pr_info("pr%u Read %lx %u pages\n", pr->id, vaddr, nr);
 	pagemap_bound_check(pr->pe, vaddr, nr);
 
 	if (pr->pe->in_parent) {
 		if (read_parent_page(pr, vaddr, nr, buf, flags) < 0)
 			return -1;
 	} else {
-		if (maybe_read_page(pr, vaddr, len, buf, flags) < 0)
+		if (maybe_read_page(pr, vaddr, nr, buf, flags) < 0)
 			return -1;
 	}
 
-	pr->cvaddr += len;
+	pr->cvaddr += nr * PAGE_SIZE;
 
 	return 1;
 }