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

mount: rename TMPFS_MAGIC into TMPFS_IMG_MAGIC

Browse Source 
TMPFS_MAGIC is already used in linux/magic.h

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2014-02-24 18:11:28 +04:00
committed by Pavel Emelyanov
parent e16f0976fc
commit 06662f9f13
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
image-desc.c
View File

@@ -65,7 +65,7 @@ struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX] = {
FD_ENTRY(IFADDR, "ifaddr-%d"),
FD_ENTRY(ROUTE, "route-%d"),
FD_ENTRY(IPTABLES, "iptables-%d"),
FD_ENTRY(TMPFS, "tmpfs-%d.tar.gz"),
FD_ENTRY(TMPFS_IMG, "tmpfs-%d.tar.gz"),
FD_ENTRY(TTY_FILES, "tty"),
FD_ENTRY(TTY_INFO, "tty-info"),
FD_ENTRY(FILE_LOCKS, "filelocks-%d"),

2
include/image-desc.h
View File

@@ -79,7 +79,7 @@ enum {
CR_FD_TUNFILE,
_CR_FD_GLOB_TO,
CR_FD_TMPFS,
CR_FD_TMPFS_IMG,
CR_FD_PAGES,
CR_FD_PSIGNAL,

2
include/magic.h
View File

@@ -75,7 +75,7 @@
#define IFADDR_MAGIC RAW_IMAGE_MAGIC
#define ROUTE_MAGIC RAW_IMAGE_MAGIC
#define TMPFS_MAGIC RAW_IMAGE_MAGIC
#define TMPFS_IMG_MAGIC RAW_IMAGE_MAGIC
#define IPTABLES_MAGIC RAW_IMAGE_MAGIC
#define PAGES_OLD_MAGIC PAGEMAP_MAGIC

4
mount.c
View File

@@ -592,7 +592,7 @@ static int tmpfs_dump(struct mount_info *pm)
goto out;
}
fd_img = open_image(CR_FD_TMPFS, O_DUMP, pm->mnt_id);
fd_img = open_image(CR_FD_TMPFS_IMG, O_DUMP, pm->mnt_id);
if (fd_img < 0)
goto out;
@@ -622,7 +622,7 @@ static int tmpfs_restore(struct mount_info *pm)
int ret;
int fd_img;
fd_img = open_image(CR_FD_TMPFS, O_RSTR, pm->mnt_id);
fd_img = open_image(CR_FD_TMPFS_IMG, O_RSTR, pm->mnt_id);
if (fd_img < 0)
return -1;