Commit 4dbc5f11 authored by Pavel Emelyanov's avatar Pavel Emelyanov

files: Don't call lseek on some restored files

Those opened for cwd, root, exe link and vma-s do not
care about the pos value.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 1e837af1
...@@ -633,7 +633,7 @@ int open_path_by_id(u32 id, int (*open_cb)(struct reg_file_info *, void *), void ...@@ -633,7 +633,7 @@ int open_path_by_id(u32 id, int (*open_cb)(struct reg_file_info *, void *), void
return open_path(fd, open_cb, arg); return open_path(fd, open_cb, arg);
} }
static int do_open_reg(struct reg_file_info *rfi, void *arg) static int do_open_reg_noseek(struct reg_file_info *rfi, void *arg)
{ {
int fd; int fd;
...@@ -643,6 +643,17 @@ static int do_open_reg(struct reg_file_info *rfi, void *arg) ...@@ -643,6 +643,17 @@ static int do_open_reg(struct reg_file_info *rfi, void *arg)
return fd; return fd;
} }
return fd;
}
static int do_open_reg(struct reg_file_info *rfi, void *arg)
{
int fd;
fd = do_open_reg_noseek(rfi, arg);
if (fd < 0)
return fd;
if ((rfi->rfe->pos != -1ULL) && if ((rfi->rfe->pos != -1ULL) &&
lseek(fd, rfi->rfe->pos, SEEK_SET) < 0) { lseek(fd, rfi->rfe->pos, SEEK_SET) < 0) {
pr_perror("Can't restore file pos"); pr_perror("Can't restore file pos");
...@@ -660,7 +671,13 @@ static int open_fe_fd(struct file_desc *fd) ...@@ -660,7 +671,13 @@ static int open_fe_fd(struct file_desc *fd)
int open_reg_by_id(u32 id) int open_reg_by_id(u32 id)
{ {
return open_path_by_id(id, do_open_reg, NULL); /*
* This one gets called by exe link, chroot,
* cwd and file vmas restoring code. No need
* in calling lseek on either of them.
*/
return open_path_by_id(id, do_open_reg_noseek, NULL);
} }
static void remap_get(struct file_desc *fdesc, char typ) static void remap_get(struct file_desc *fdesc, char typ)
......
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