diff options
| author | Jiro SEKIBA <jir@unicus.jp> | 2011-03-10 16:54:15 +0900 |
|---|---|---|
| committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2011-03-10 17:29:40 +0900 |
| commit | 4d3cf1bc557dc8b88e1cabf1980b3baa3380a641 (patch) | |
| tree | 7a35e25da0a998b148149a108ff40f1a2d4f8e52 | |
| parent | e3154e9748f0f337e9f6ff9dc7d7bf24d426bd1a (diff) | |
| download | linux-stable-4d3cf1bc557dc8b88e1cabf1980b3baa3380a641.tar.gz linux-stable-4d3cf1bc557dc8b88e1cabf1980b3baa3380a641.tar.bz2 linux-stable-4d3cf1bc557dc8b88e1cabf1980b3baa3380a641.zip | |
nilfs2: move NILFS_SUPER_MAGIC to linux/magic.h
move NILFS_SUPER_MAGIC macro to linux/magic.h from linux/nilfs2_fs.h
in the same manner as other filesystem magic number defined in the file.
Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
| -rw-r--r-- | include/linux/magic.h | 1 | ||||
| -rw-r--r-- | include/linux/nilfs2_fs.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h index 62730ea2b56e..248930efdd31 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -23,6 +23,7 @@ #define XENFS_SUPER_MAGIC 0xabba1974 #define EXT4_SUPER_MAGIC 0xEF53 #define BTRFS_SUPER_MAGIC 0x9123683E +#define NILFS_SUPER_MAGIC 0x3434 #define HPFS_SUPER_MAGIC 0xf995e849 #define ISOFS_SUPER_MAGIC 0x9660 #define JFFS2_SUPER_MAGIC 0x72b6 diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h index ae33ac2db62d..8768c469e93e 100644 --- a/include/linux/nilfs2_fs.h +++ b/include/linux/nilfs2_fs.h @@ -40,6 +40,7 @@ #include <linux/types.h> #include <linux/ioctl.h> +#include <linux/magic.h> #define NILFS_INODE_BMAP_SIZE 7 @@ -242,7 +243,6 @@ struct nilfs_super_block { #define NILFS_USER_INO 11 /* Fisrt user's file inode number */ #define NILFS_SB_OFFSET_BYTES 1024 /* byte offset of nilfs superblock */ -#define NILFS_SUPER_MAGIC 0x3434 /* NILFS filesystem magic number */ #define NILFS_SEG_MIN_BLOCKS 16 /* Minimum number of blocks in a full segment */ |