Commit 530b6d11 authored by Tikhomirov Pavel's avatar Tikhomirov Pavel Committed by Pavel Emelyanov

v3 page-read: replace read_pagemap_page_from_parent with seek_pagemap_page

Signed-off-by: 's avatarTikhomirov Pavel <snorcht@gmail.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 632798b7
...@@ -83,7 +83,7 @@ static void skip_pagemap_pages(struct page_read *pr, unsigned long len) ...@@ -83,7 +83,7 @@ static void skip_pagemap_pages(struct page_read *pr, unsigned long len)
pr->cvaddr += len; pr->cvaddr += len;
} }
static int read_pagemap_page_from_parent(struct page_read *pr, unsigned long vaddr, void *buf, bool warn) static int seek_pagemap_page(struct page_read *pr, unsigned long vaddr, bool warn)
{ {
int ret; int ret;
struct iovec iov; struct iovec iov;
...@@ -116,7 +116,7 @@ new_pagemap: ...@@ -116,7 +116,7 @@ new_pagemap:
} }
skip_pagemap_pages(pr, vaddr - pr->cvaddr); skip_pagemap_pages(pr, vaddr - pr->cvaddr);
return read_pagemap_page(pr, vaddr, buf); return 0;
} }
} }
...@@ -126,7 +126,10 @@ static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, void *bu ...@@ -126,7 +126,10 @@ static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, void *bu
if (pr->pe->in_parent) { if (pr->pe->in_parent) {
pr_debug("\tpr%u Read page %lx from parent\n", pr->id, vaddr); pr_debug("\tpr%u Read page %lx from parent\n", pr->id, vaddr);
ret = read_pagemap_page_from_parent(pr->parent, vaddr, buf, true); ret = seek_pagemap_page(pr->parent, vaddr, true);
if (ret == -1)
return ret;
ret = read_pagemap_page(pr->parent, vaddr, buf);
if (ret == -1) if (ret == -1)
return ret; return ret;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment