Commit bda3baa3 authored by Andrey Vagin's avatar Andrey Vagin Committed by Cyrill Gorcunov

files: use lseek instead of open

Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent 14e42bb7
...@@ -491,22 +491,26 @@ static int open_fdinfo(int pid, struct fdinfo_entry *fe, int *fdinfo_fd, int sta ...@@ -491,22 +491,26 @@ static int open_fdinfo(int pid, struct fdinfo_entry *fe, int *fdinfo_fd, int sta
int prepare_fds(int pid) int prepare_fds(int pid)
{ {
u32 type = 0, err = -11, ret; u32 type = 0, err = -1, ret;
int fdinfo_fd; int fdinfo_fd;
int state; int state;
off_t offset; off_t offset, magic_offset;
struct fdinfo_entry fe; struct fdinfo_entry fe;
int nr = 0; int nr = 0;
pr_info("%d: Opening fdinfo-s\n", pid); pr_info("%d: Opening fdinfo-s\n", pid);
fdinfo_fd = open_image_ro(CR_FD_FDINFO, pid);
if (fdinfo_fd < 0) {
pr_perror("%d: Can't open pipes img\n", pid);
return -1;
}
magic_offset = lseek(fdinfo_fd, 0, SEEK_CUR);
for (state = 0; state < FD_STATE_MAX; state++) { for (state = 0; state < FD_STATE_MAX; state++) {
fdinfo_fd = open_image_ro(CR_FD_FDINFO, pid); lseek(fdinfo_fd, magic_offset, SEEK_SET);
if (fdinfo_fd < 0) {
pr_perror("%d: Can't open pipes img\n", pid);
return -1;
}
while (1) { while (1) {
ret = read(fdinfo_fd, &fe, sizeof(fe)); ret = read(fdinfo_fd, &fe, sizeof(fe));
...@@ -540,10 +544,8 @@ int prepare_fds(int pid) ...@@ -540,10 +544,8 @@ int prepare_fds(int pid)
lseek(fdinfo_fd, offset + fe.len, SEEK_SET); lseek(fdinfo_fd, offset + fe.len, SEEK_SET);
} }
close(fdinfo_fd);
} }
err = 0;
return 0;
err: err:
close(fdinfo_fd); close(fdinfo_fd);
return err; return 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