Commit bae33244 authored by Pavel Emelyanov's avatar Pavel Emelyanov

ghost: Cleanup ghost file dumping

No need in function-wide fd variable for copying file.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 679c5326
...@@ -209,7 +209,7 @@ tail: ...@@ -209,7 +209,7 @@ tail:
static int dump_ghost_file(int _fd, u32 id, const struct stat *st) static int dump_ghost_file(int _fd, u32 id, const struct stat *st)
{ {
int img, fd = -1; int img;
GhostFileEntry gfe = GHOST_FILE_ENTRY__INIT; GhostFileEntry gfe = GHOST_FILE_ENTRY__INIT;
char lpath[32]; char lpath[32];
...@@ -227,6 +227,8 @@ static int dump_ghost_file(int _fd, u32 id, const struct stat *st) ...@@ -227,6 +227,8 @@ static int dump_ghost_file(int _fd, u32 id, const struct stat *st)
return -1; return -1;
if (S_ISREG(st->st_mode)) { if (S_ISREG(st->st_mode)) {
int fd;
/* /*
* Reopen file locally since it may have no read * Reopen file locally since it may have no read
* permissions when drained * permissions when drained
...@@ -239,9 +241,10 @@ static int dump_ghost_file(int _fd, u32 id, const struct stat *st) ...@@ -239,9 +241,10 @@ static int dump_ghost_file(int _fd, u32 id, const struct stat *st)
} }
if (copy_file(fd, img, st->st_size)) if (copy_file(fd, img, st->st_size))
return -1; return -1;
close(fd);
} }
close_safe(&fd);
close(img); close(img);
return 0; return 0;
} }
......
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