Commit 9129d4e2 authored by Andrey Vagin's avatar Andrey Vagin Committed by Cyrill Gorcunov

restore: don't use char in image struct-s

Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent d6a1cd0f
...@@ -118,7 +118,7 @@ static int collect_fd(int pid, struct fdinfo_entry *e) ...@@ -118,7 +118,7 @@ static int collect_fd(int pid, struct fdinfo_entry *e)
for (i = 0; i < nr_fdinfo_descs; i++) { for (i = 0; i < nr_fdinfo_descs; i++) {
desc = &fdinfo_descs[i]; desc = &fdinfo_descs[i];
if (strncmp(desc->id, e->id, FD_ID_SIZE)) if (strncmp(desc->id, (char *) e->id, FD_ID_SIZE))
continue; continue;
fdinfo_descs[i].users++; fdinfo_descs[i].users++;
...@@ -465,7 +465,7 @@ static int open_fdinfo(int pid, struct fdinfo_entry *fe, int *fdinfo_fd, int sta ...@@ -465,7 +465,7 @@ static int open_fdinfo(int pid, struct fdinfo_entry *fe, int *fdinfo_fd, int sta
u32 mag; u32 mag;
int ret; int ret;
struct fdinfo_desc *fi = find_fd(fe->id); struct fdinfo_desc *fi = find_fd((char *)fe->id);
if (move_img_fd(fdinfo_fd, (int)fe->addr)) if (move_img_fd(fdinfo_fd, (int)fe->addr))
return -1; return -1;
......
...@@ -29,7 +29,7 @@ struct fdinfo_entry { ...@@ -29,7 +29,7 @@ struct fdinfo_entry {
u16 flags; u16 flags;
u32 pos; u32 pos;
u64 addr; u64 addr;
char id[FD_ID_SIZE]; u8 id[FD_ID_SIZE];
u8 name[0]; u8 name[0];
} __packed; } __packed;
......
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