[PATCH 12/22] hfsplus: move HFSPLUS_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.

Signed-off-by: Karel Zak <kzak@xxxxxxxxxx>
---
 fs/hfsplus/hfsplus_raw.h   | 2 +-
 include/uapi/linux/magic.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
index 8ffb3a8..73b2701 100644
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
@@ -14,6 +14,7 @@
 #define _LINUX_HFSPLUS_RAW_H
 
 #include <linux/types.h>
+#include <linux/magic.h>
 
 /* Some constants */
 #define HFSPLUS_SECTOR_SIZE        512
@@ -21,7 +22,6 @@
 #define HFSPLUS_VOLHEAD_SECTOR       2
 #define HFSPLUS_VOLHEAD_SIG     0x482b
 #define HFSPLUS_VOLHEAD_SIGX    0x4858
-#define HFSPLUS_SUPER_MAGIC     0x482b
 #define HFSPLUS_MIN_VERSION          4
 #define HFSPLUS_CURRENT_VERSION      5
 
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 14f2a96..4980428 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -39,6 +39,7 @@
 #define JFFS2_SUPER_MAGIC	0x72b6
 #define PSTOREFS_MAGIC		0x6165676C
 #define EFIVARFS_MAGIC		0xde5e81e4
+#define HFSPLUS_SUPER_MAGIC	0x482b
 #define HOSTFS_SUPER_MAGIC	0x00c0ffee
 #define VXFS_SUPER_MAGIC	0xa501FCF5
 #define XFS_SUPER_MAGIC		0x58465342
-- 
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