From 06662f9f1331c80c9c0a6a514dcc9a337c38191c Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin@openvz.org>
Date: Mon, 24 Feb 2014 18:11:28 +0400
Subject: [PATCH] mount: rename TMPFS_MAGIC into TMPFS_IMG_MAGIC

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>
---
 image-desc.c         | 2 +-
 include/image-desc.h | 2 +-
 include/magic.h      | 2 +-
 mount.c              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/image-desc.c b/image-desc.c
index aa879e6a9..5a48d4be2 100644
--- a/image-desc.c
+++ b/image-desc.c
@@ -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"),
diff --git a/include/image-desc.h b/include/image-desc.h
index 2fe7caedc..457b6dc6b 100644
--- a/include/image-desc.h
+++ b/include/image-desc.h
@@ -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,
 
diff --git a/include/magic.h b/include/magic.h
index 2ec553e90..6b111f5ea 100644
--- a/include/magic.h
+++ b/include/magic.h
@@ -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
diff --git a/mount.c b/mount.c
index cc980c692..6c70c8081 100644
--- a/mount.c
+++ b/mount.c
@@ -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;