[CRIU] [PATCH] deduplication: fix bug in auto-dedup when it is on page-server

Tikhomirov Pavel snorcht at gmail.com
Thu Mar 6 01:14:22 PST 2014


no need to check opts.use_page_server, because in write_pagemap_loc
write is local anyway. it appeared that on page-server when saving
pages to images opts.use_page_server=true and no auto-dedup started,
so images were not null as expected.

Signed-off-by: Tikhomirov Pavel <snorcht at gmail.com>
---
 page-xfer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/page-xfer.c b/page-xfer.c
index 7e246ca..b1e18a1 100644
--- a/page-xfer.c
+++ b/page-xfer.c
@@ -460,7 +460,7 @@ static int write_pagemap_loc(struct page_xfer *xfer,
 	pe.vaddr = encode_pointer(iov->iov_base);
 	pe.nr_pages = iov->iov_len / PAGE_SIZE;
 
-	if (opts.auto_dedup && !opts.use_page_server && xfer->parent != NULL) {
+	if (opts.auto_dedup && xfer->parent != NULL) {
 		ret = dedup_one_iovec(xfer->parent, iov);
 		if (ret == -1) {
 			pr_perror("Auto-deduplication failed");
-- 
1.8.3.2



More information about the CRIU mailing list