[PATCH 09/22] freevxfs: move VXFS_SUPER_MAGIC to <linux/magic.h>

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Move the magic number to proper place.

CC: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Signed-off-by: Karel Zak <kzak@xxxxxxxxxx>
---
 fs/freevxfs/vxfs.h         | 6 +-----
 include/uapi/linux/magic.h | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/freevxfs/vxfs.h b/fs/freevxfs/vxfs.h
index c8a9265..165d3c6 100644
--- a/fs/freevxfs/vxfs.h
+++ b/fs/freevxfs/vxfs.h
@@ -37,6 +37,7 @@
  * superblocks of the Veritas Filesystem.
  */
 #include <linux/types.h>
+#include <linux/magic.h>
 
 
 /*
@@ -46,11 +47,6 @@ typedef	int32_t		vx_daddr_t;
 typedef int32_t		vx_ino_t;
 
 /*
- * Superblock magic number (vxfs_super->vs_magic).
- */
-#define VXFS_SUPER_MAGIC	0xa501FCF5
-
-/*
  * The root inode.
  */
 #define VXFS_ROOT_INO		2
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 0c91e37..a55b22a 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -38,6 +38,7 @@
 #define PSTOREFS_MAGIC		0x6165676C
 #define EFIVARFS_MAGIC		0xde5e81e4
 #define HOSTFS_SUPER_MAGIC	0x00c0ffee
+#define VXFS_SUPER_MAGIC	0xa501FCF5
 #define XFS_SUPER_MAGIC		0x58465342
 
 #define MINIX_SUPER_MAGIC	0x137F		/* minix v1 fs, 14 char names */
-- 
1.8.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [Samba]     [Device Mapper]     [CEPH Development]
  Powered by Linux