|
 |
d2b3e5 |
From 454fe3e7c07ba48a7a065135482196b53e376de0 Mon Sep 17 00:00:00 2001
|
|
|
d2b3e5 |
From: Dmitry Safonov <dima@arista.com>
|
|
|
d2b3e5 |
Date: Thu, 10 May 2018 19:14:42 +0100
|
|
|
d2b3e5 |
Subject: [PATCH 2/8] parasite: Rename misnamed nr_pages
|
|
|
d2b3e5 |
|
|
|
d2b3e5 |
It's actually number of bytes spliced, not pages.
|
|
|
d2b3e5 |
And I bet (unsigned long) suits the purpose more than (int).
|
|
|
d2b3e5 |
|
|
|
d2b3e5 |
Signed-off-by: Dmitry Safonov <dima@arista.com>
|
|
|
d2b3e5 |
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
|
|
|
d2b3e5 |
---
|
|
|
d2b3e5 |
criu/pie/parasite.c | 10 +++++-----
|
|
|
d2b3e5 |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
d2b3e5 |
|
|
|
d2b3e5 |
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
|
|
|
d2b3e5 |
index 7a48f324e..b9dae3f94 100644
|
|
|
d2b3e5 |
--- a/criu/pie/parasite.c
|
|
|
d2b3e5 |
+++ b/criu/pie/parasite.c
|
|
|
d2b3e5 |
@@ -67,7 +67,8 @@ static int dump_pages(struct parasite_dump_pages_args *args)
|
|
|
d2b3e5 |
{
|
|
|
d2b3e5 |
int p, ret, tsock;
|
|
|
d2b3e5 |
struct iovec *iovs;
|
|
|
d2b3e5 |
- int off, nr_segs, nr_pages;
|
|
|
d2b3e5 |
+ int off, nr_segs;
|
|
|
d2b3e5 |
+ unsigned long spliced_bytes = 0;
|
|
|
d2b3e5 |
|
|
|
d2b3e5 |
tsock = parasite_get_rpc_sock();
|
|
|
d2b3e5 |
p = recv_fd(tsock);
|
|
|
d2b3e5 |
@@ -75,7 +76,6 @@ static int dump_pages(struct parasite_dump_pages_args *args)
|
|
|
d2b3e5 |
return -1;
|
|
|
d2b3e5 |
|
|
|
d2b3e5 |
iovs = pargs_iovs(args);
|
|
|
d2b3e5 |
- nr_pages = 0;
|
|
|
d2b3e5 |
off = 0;
|
|
|
d2b3e5 |
nr_segs = args->nr_segs;
|
|
|
d2b3e5 |
if (nr_segs > UIO_MAXIOV)
|
|
|
d2b3e5 |
@@ -89,16 +89,16 @@ static int dump_pages(struct parasite_dump_pages_args *args)
|
|
|
d2b3e5 |
ret, nr_segs, args->off + off);
|
|
|
d2b3e5 |
return -1;
|
|
|
d2b3e5 |
}
|
|
|
d2b3e5 |
- nr_pages += ret;
|
|
|
d2b3e5 |
+ spliced_bytes += ret;
|
|
|
d2b3e5 |
off += nr_segs;
|
|
|
d2b3e5 |
if (off == args->nr_segs)
|
|
|
d2b3e5 |
break;
|
|
|
d2b3e5 |
if (off + nr_segs > args->nr_segs)
|
|
|
d2b3e5 |
nr_segs = args->nr_segs - off;
|
|
|
d2b3e5 |
}
|
|
|
d2b3e5 |
- if (nr_pages != args->nr_pages * PAGE_SIZE) {
|
|
|
d2b3e5 |
+ if (spliced_bytes != args->nr_pages * PAGE_SIZE) {
|
|
|
d2b3e5 |
sys_close(p);
|
|
|
d2b3e5 |
- pr_err("Can't splice all pages to pipe (%d/%d)\n", nr_pages, args->nr_pages);
|
|
|
d2b3e5 |
+ pr_err("Can't splice all pages to pipe (%lu/%d)\n", spliced_bytes, args->nr_pages);
|
|
|
d2b3e5 |
return -1;
|
|
|
d2b3e5 |
}
|
|
|
d2b3e5 |
|
|
|
d2b3e5 |
--
|
|
|
d2b3e5 |
2.17.0
|
|
|
d2b3e5 |
|