Commit 62aa81d7 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds

ocfs2: use magic.h

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

Link: http://lkml.kernel.org/r/20170521154217.27917-1-fabf@skynet.beSigned-off-by: default avatarFabian Frederick <fabf@skynet.be>
Reviewed-by: default avatarMark Fasheh <mfasheh@versity.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8c4d5a43
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef _OCFS2_FS_H #ifndef _OCFS2_FS_H
#define _OCFS2_FS_H #define _OCFS2_FS_H
#include <linux/magic.h>
/* Version */ /* Version */
#define OCFS2_MAJOR_REV_LEVEL 0 #define OCFS2_MAJOR_REV_LEVEL 0
#define OCFS2_MINOR_REV_LEVEL 90 #define OCFS2_MINOR_REV_LEVEL 90
...@@ -56,9 +58,6 @@ ...@@ -56,9 +58,6 @@
#define OCFS2_MIN_BLOCKSIZE 512 #define OCFS2_MIN_BLOCKSIZE 512
#define OCFS2_MAX_BLOCKSIZE OCFS2_MIN_CLUSTERSIZE #define OCFS2_MAX_BLOCKSIZE OCFS2_MIN_CLUSTERSIZE
/* Filesystem magic number */
#define OCFS2_SUPER_MAGIC 0x7461636f
/* Object signatures */ /* Object signatures */
#define OCFS2_SUPER_BLOCK_SIGNATURE "OCFSV2" #define OCFS2_SUPER_BLOCK_SIGNATURE "OCFSV2"
#define OCFS2_INODE_SIGNATURE "INODE01" #define OCFS2_INODE_SIGNATURE "INODE01"
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#define MSDOS_SUPER_MAGIC 0x4d44 /* MD */ #define MSDOS_SUPER_MAGIC 0x4d44 /* MD */
#define NCP_SUPER_MAGIC 0x564c /* Guess, what 0x564c is :-) */ #define NCP_SUPER_MAGIC 0x564c /* Guess, what 0x564c is :-) */
#define NFS_SUPER_MAGIC 0x6969 #define NFS_SUPER_MAGIC 0x6969
#define OCFS2_SUPER_MAGIC 0x7461636f
#define OPENPROM_SUPER_MAGIC 0x9fa1 #define OPENPROM_SUPER_MAGIC 0x9fa1
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define QNX6_SUPER_MAGIC 0x68191122 /* qnx6 fs detection */ #define QNX6_SUPER_MAGIC 0x68191122 /* qnx6 fs detection */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment