Commit ba96e646 authored by Pavel Emelyanov's avatar Pavel Emelyanov

page-read: Fix naming

The open_page_at one is quite obfuscating.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 55b96d01
......@@ -67,7 +67,7 @@ struct page_read {
};
extern int open_page_read(int pid, struct page_read *);
extern int open_page_at(int dfd, int pid, struct page_read *pr, int flags);
extern int open_page_read_at(int dfd, int pid, struct page_read *pr, int flags);
extern int open_page_rw(int pid, struct page_read *);
extern void pagemap2iovec(PagemapEntry *pe, struct iovec *iov);
extern int seek_pagemap_page(struct page_read *pr, unsigned long vaddr, bool warn);
......
......@@ -181,7 +181,7 @@ static int try_open_parent(int dfd, int pid, struct page_read *pr, int flags)
if (!parent)
goto err_cl;
if (open_page_at(pfd, pid, parent, flags)) {
if (open_page_read_at(pfd, pid, parent, flags)) {
if (errno != ENOENT)
goto err_free;
xfree(parent);
......@@ -200,7 +200,7 @@ err_cl:
return -1;
}
int open_page_at(int dfd, int pid, struct page_read *pr, int flags)
int open_page_read_at(int dfd, int pid, struct page_read *pr, int flags)
{
pr->pe = NULL;
......@@ -242,17 +242,12 @@ int open_page_at(int dfd, int pid, struct page_read *pr, int flags)
return 0;
}
static int open_page_read_at(int dfd, int pid, struct page_read *pr)
{
return open_page_at(dfd, pid, pr, O_RSTR);
}
int open_page_read(int pid, struct page_read *pr)
{
return open_page_read_at(get_service_fd(IMG_FD_OFF), pid, pr);
return open_page_read_at(get_service_fd(IMG_FD_OFF), pid, pr, O_RSTR);
}
int open_page_rw(int pid, struct page_read *pr)
{
return open_page_at(get_service_fd(IMG_FD_OFF), pid, pr, O_RDWR);
return open_page_read_at(get_service_fd(IMG_FD_OFF), pid, pr, O_RDWR);
}
......@@ -568,7 +568,7 @@ static int open_page_local_xfer(struct page_xfer *xfer, int fd_type, long id)
return -1;
}
ret = open_page_at(pfd, id, xfer->parent, O_RDWR);
ret = open_page_read_at(pfd, id, xfer->parent, O_RDWR);
if (ret) {
pr_perror("Can't dedup old image format");
xfree(xfer->parent);
......
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