Commit 73b689f8 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

page-read: Don't check that an image file contains data

Modern tar and rsync can replace zero chunks with holes. So it's valid situation
and shouldn't abort the restore.
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 0758b4c2
...@@ -141,10 +141,6 @@ static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, void *bu ...@@ -141,10 +141,6 @@ static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, void *bu
off_t current_vaddr = lseek(pr->fd_pg, 0, SEEK_CUR); off_t current_vaddr = lseek(pr->fd_pg, 0, SEEK_CUR);
pr_debug("\tpr%u Read page %lx from self %lx/%"PRIx64"\n", pr->id, pr_debug("\tpr%u Read page %lx from self %lx/%"PRIx64"\n", pr->id,
vaddr, pr->cvaddr, current_vaddr); vaddr, pr->cvaddr, current_vaddr);
if (current_vaddr != lseek(pr->fd_pg, current_vaddr, SEEK_DATA)) {
pr_perror("Can't read page because of hole /%"PRIx64, current_vaddr);
return -1;
}
ret = read(pr->fd_pg, buf, PAGE_SIZE); ret = read(pr->fd_pg, buf, PAGE_SIZE);
if (ret != PAGE_SIZE) { if (ret != PAGE_SIZE) {
pr_perror("Can't read mapping page %d", ret); pr_perror("Can't read mapping page %d", ret);
......
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