mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 05:48:05 +00:00
Code Issues Releases Wiki Activity

kerndat: Handle errors from devtmpfs virtualized checks

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov 2014-11-10 10:48:10 +04:00
parent 69bffe26d3
commit 00770a91c1
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mount.c
View File

@ -745,16 +745,30 @@ out:
return ret; return ret;
} }
static bool rt_detmpfs_match(struct mount_info *pm) /*
* Virtualized devtmpfs on any side (dump or restore)
* means, that we should try to handle it as a plain
* tmpfs.
*
* Interesting case -- shared on dump and virtual on
* restore -- will fail, since no tarball with the fs
* contents will be found.
*/
static int devtmpfs_virtual(struct mount_info *pm)
{ {
return kerndat_fs_virtualized(KERNDAT_FS_STAT_DEVTMPFS, pm->s_dev) == 0; return kerndat_fs_virtualized(KERNDAT_FS_STAT_DEVTMPFS, pm->s_dev);
} }
static int devtmpfs_dump(struct mount_info *pm) static int devtmpfs_dump(struct mount_info *pm)
{ {
if (!rt_detmpfs_match(pm)) int ret;
return tmpfs_dump(pm);
return 0; ret = devtmpfs_virtual(pm);
if (ret == 1)
ret = tmpfs_dump(pm);
return ret;
} }
static int tmpfs_restore(struct mount_info *pm) static int tmpfs_restore(struct mount_info *pm)
@ -783,9 +797,13 @@ static int tmpfs_restore(struct mount_info *pm)
static int devtmpfs_restore(struct mount_info *pm) static int devtmpfs_restore(struct mount_info *pm)
{ {
if (!rt_detmpfs_match(pm)) int ret;
return tmpfs_restore(pm);
return 0; ret = devtmpfs_virtual(pm);
if (ret == 1)
ret = tmpfs_restore(pm);
return ret;
} }
static int binfmt_misc_dump(struct mount_info *pm) static int binfmt_misc_dump(struct mount_info *pm)