[CRIU] [PATCH v3 07/19] lazy-pages: drop _page suffix from uffd_{copy, zero}_page

Mike Rapoport rppt at linux.vnet.ibm.com
Tue Nov 15 08:57:16 PST 2016


Signed-off-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
---
 criu/uffd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/criu/uffd.c b/criu/uffd.c
index af415c4..7ffc6de 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -512,7 +512,7 @@ out:
 	return -1;
 }
 
-static int uffd_copy_page(struct lazy_pages_info *lpi, __u64 address)
+static int uffd_copy(struct lazy_pages_info *lpi, __u64 address)
 {
 	struct uffdio_copy uffdio_copy;
 	int rc;
@@ -544,7 +544,7 @@ static int uffd_copy_page(struct lazy_pages_info *lpi, __u64 address)
 
 }
 
-static int uffd_zero_page(struct lazy_pages_info *lpi, __u64 address)
+static int uffd_zero(struct lazy_pages_info *lpi, __u64 address)
 {
 	struct uffdio_zeropage uffdio_zeropage;
 	unsigned long ps = page_size();
@@ -583,7 +583,7 @@ static int uffd_handle_page(struct lazy_pages_info *lpi, __u64 address)
 	 * seek_page return value here
 	 */
 	if (ret == 0 || pagemap_zero(lpi->pr.pe))
-		return uffd_zero_page(lpi, address);
+		return uffd_zero(lpi, address);
 
 	if (opts.use_page_server)
 		ret = get_remote_pages(lpi->pid, address, 1, lpi->buf);
@@ -595,7 +595,7 @@ static int uffd_handle_page(struct lazy_pages_info *lpi, __u64 address)
 		return ret;
 	}
 
-	return uffd_copy_page(lpi, address);
+	return uffd_copy(lpi, address);
 }
 
 static int handle_remaining_pages(struct lazy_pages_info *lpi)
-- 
1.9.1



More information about the CRIU mailing list