[PATCH 09/11 linux-next] freevxfs: use magic.h

[Fabian Frederick]

Filesystems generally use SUPER_MAGIC values from magic.h
instead of a local definition.

Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
---
 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 a41ea0b..3bde7dd 100644
--- a/fs/freevxfs/vxfs.h
+++ b/fs/freevxfs/vxfs.h
@@ -38,11 +38,7 @@
  * superblocks of the Veritas Filesystem.
  */
 #include <linux/types.h>
-
-/*
- * Superblock magic number (vxfs_super->vs_magic).
- */
-#define VXFS_SUPER_MAGIC	0xa501FCF5
+#include <linux/magic.h>
 
 /*
  * The root inode.
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 6afc4b2..e61d5af 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -78,6 +78,7 @@
 #define UDF_SUPER_MAGIC		0x15013346	/* Since UDF 2.01 is ISO 13346 based... */
 #define USBDEVICE_SUPER_MAGIC	0x9fa2
 #define V9FS_MAGIC		0x01021997
+#define VXFS_SUPER_MAGIC	0xa501FCF5
 #define XENFS_SUPER_MAGIC	0xabba1974
 #define ZSMALLOC_MAGIC		0x58295829
 
-- 
2.9.3