metadump: Rename XFS_MD_MAGIC to XFS_MD_MAGIC_V1

Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/db/metadump.c b/db/metadump.c
index c11503c71347db37ef2fbb003f1895adb482b2be..bc203893c6205d85f461150fa5ce71352df95893 100644 (file)
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -2648,7 +2648,7 @@ init_metadump_v1(void)
                return -1;
        }
        metadump.metablock->mb_blocklog = BBSHIFT;
-       metadump.metablock->mb_magic = cpu_to_be32(XFS_MD_MAGIC);
+       metadump.metablock->mb_magic = cpu_to_be32(XFS_MD_MAGIC_V1);
 
        /* Set flags about state of metadump */
        metadump.metablock->mb_info = XFS_METADUMP_INFO_FLAGS;

diff --git a/include/xfs_metadump.h b/include/xfs_metadump.h
index fbd9902327b89dd2d607a40e52d22a614d6c8206..a4dca25cb9cd6fcdc2414099587866446ee34acd 100644 (file)
--- a/include/xfs_metadump.h
+++ b/include/xfs_metadump.h
@@ -7,7 +7,7 @@
 #ifndef _XFS_METADUMP_H_
 #define _XFS_METADUMP_H_
 
-#define        XFS_MD_MAGIC            0x5846534d      /* 'XFSM' */
+#define        XFS_MD_MAGIC_V1         0x5846534d      /* 'XFSM' */
 
 typedef struct xfs_metablock {
        __be32          mb_magic;

diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 333282ed2a91dec92dfd0feec12b1ee37c3280ed..481dd00c2e710846e73175485dd69d55f28276e7 100644 (file)
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -240,7 +240,7 @@ main(
 
        if (fread(&mb, sizeof(mb), 1, src_f) != 1)
                fatal("error reading from metadump file\n");
-       if (mb.mb_magic != cpu_to_be32(XFS_MD_MAGIC))
+       if (mb.mb_magic != cpu_to_be32(XFS_MD_MAGIC_V1))
                fatal("specified file is not a metadata dump\n");
 
        if (show_info) {