mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 15:25:21 +00:00
Code Issues Releases Wiki Activity

fsnotify: Move decoding handle into function

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2013-10-15 13:13:58 +04:00
parent 7bb5ba1ffe
commit 7eb20e7ddb
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fsnotify.c
View File

@@ -175,6 +175,18 @@ const struct fdtype_ops fanotify_dump_ops = {
.dump = dump_one_fanotify, .dump = dump_one_fanotify,
}; };
static void decode_handle(fh_t *handle, FhEntry *img)
{
memzero(handle, sizeof(*handle));
handle->type = img->type;
handle->bytes = img->bytes;
memcpy(handle->__handle, img->handle,
min(pb_repeated_size(img, handle),
sizeof(handle->__handle)));
}
static char *get_mark_path(const char *who, struct file_remap *remap, static char *get_mark_path(const char *who, struct file_remap *remap,
FhEntry *f_handle, unsigned long i_ino, FhEntry *f_handle, unsigned long i_ino,
unsigned int s_dev, char *buf, size_t size, unsigned int s_dev, char *buf, size_t size,
@@ -190,14 +202,7 @@ static char *get_mark_path(const char *who, struct file_remap *remap,
return remap->path; return remap->path;
} }
memzero(&handle, sizeof(handle)); decode_handle(&handle, f_handle);
handle.type = f_handle->type;
handle.bytes = f_handle->bytes;
memcpy(handle.__handle, f_handle->handle,
min(pb_repeated_size(f_handle, handle),
sizeof(handle.__handle)));
mntfd = open_mount(s_dev); mntfd = open_mount(s_dev);
if (mntfd < 0) { if (mntfd < 0) {