[02/13] page-read: Don't check for cache/proxy in local case

Submitted by Pavel Emelianov on July 6, 2017, 9:38 a.m.

Details

Message ID 56ce2259-dac7-4816-1555-88197c0bfc9f@virtuozzo.com
State Accepted
Series "A set of cleanups for pagemaps/xfers/reads before master merge (resend)"
Headers show

Commit Message

Pavel Emelianov July 6, 2017, 9:38 a.m.
The opts.remote is always false in this code.

Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/pagemap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/criu/pagemap.c b/criu/pagemap.c
index 4a0f142..441b42d 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -400,7 +400,7 @@  static int maybe_read_page_local(struct page_read *pr, unsigned long vaddr,
 	 * for us for urgent async read, just do the regular
 	 * cached read.
 	 */
-	if ((flags & (PR_ASYNC|PR_ASAP)) == PR_ASYNC && !opts.remote)
+	if ((flags & (PR_ASYNC|PR_ASAP)) == PR_ASYNC)
 		ret = pagemap_enqueue_iovec(pr, buf, len, &pr->async);
 	else {
 		ret = read_local_page(pr, vaddr, len, buf);