Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d3cf1bc authored by Jiro SEKIBA's avatar Jiro SEKIBA Committed by Ryusuke Konishi
Browse files

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: default avatarJiro SEKIBA <jir@unicus.jp>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent e3154e97

include/linux/magic.h

+1 −0
Original line number Diff line number Diff line
@@ -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

include/linux/nilfs2_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */