Skip to content

Commit

Permalink
nilfs2: move NILFS_SUPER_MAGIC to linux/magic.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiro SEKIBA authored and Ryusuke Konishi committed Mar 10, 2011
1 parent e3154e9 commit 4d3cf1b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions include/linux/magic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/linux/nilfs2_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

#include <linux/types.h>
#include <linux/ioctl.h>
#include <linux/magic.h>


#define NILFS_INODE_BMAP_SIZE 7
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 4d3cf1b

Please sign in to comment.