Commit cf64851b authored by Pavel Emelyanov's avatar Pavel Emelyanov

pb: Pass cr_img into image_name()

The pb_(read|write)-s will stop using plan fd soon.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent 295090c1
...@@ -492,8 +492,9 @@ void do_pb_show_plain(struct cr_img *img, int type, int single_entry, ...@@ -492,8 +492,9 @@ void do_pb_show_plain(struct cr_img *img, int type, int single_entry,
} }
} }
static char *image_name(int fd) static char *image_name(struct cr_img *img)
{ {
int fd = img->_fd;
static char image_path[PATH_MAX]; static char image_path[PATH_MAX];
if (read_fd_link(fd, image_path, sizeof(image_path)) > 0) if (read_fd_link(fd, image_path, sizeof(image_path)) > 0)
...@@ -522,7 +523,7 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof) ...@@ -522,7 +523,7 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
if (!cr_pb_descs[type].pb_desc) { if (!cr_pb_descs[type].pb_desc) {
pr_err("Wrong object requested %d on %s\n", pr_err("Wrong object requested %d on %s\n",
type, image_name(fd)); type, image_name(img));
return -1; return -1;
} }
...@@ -534,13 +535,13 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof) ...@@ -534,13 +535,13 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
return 0; return 0;
} else { } else {
pr_err("Unexpected EOF on %s\n", pr_err("Unexpected EOF on %s\n",
image_name(fd)); image_name(img));
return -1; return -1;
} }
} else if (ret < sizeof(size)) { } else if (ret < sizeof(size)) {
pr_perror("Read %d bytes while %d expected on %s", pr_perror("Read %d bytes while %d expected on %s",
ret, (int)sizeof(size), ret, (int)sizeof(size),
image_name(fd)); image_name(img));
return -1; return -1;
} }
...@@ -554,11 +555,11 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof) ...@@ -554,11 +555,11 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
ret = read(fd, buf, size); ret = read(fd, buf, size);
if (ret < 0) { if (ret < 0) {
pr_perror("Can't read %d bytes from file %s", pr_perror("Can't read %d bytes from file %s",
size, image_name(fd)); size, image_name(img));
goto err; goto err;
} else if (ret != size) { } else if (ret != size) {
pr_perror("Read %d bytes while %d expected from %s", pr_perror("Read %d bytes while %d expected from %s",
ret, size, image_name(fd)); ret, size, image_name(img));
ret = -1; ret = -1;
goto err; goto err;
} }
...@@ -567,7 +568,7 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof) ...@@ -567,7 +568,7 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
if (!*pobj) { if (!*pobj) {
ret = -1; ret = -1;
pr_err("Failed unpacking object %p from %s\n", pr_err("Failed unpacking object %p from %s\n",
pobj, image_name(fd)); pobj, image_name(img));
goto err; goto err;
} }
......
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