Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jiro SEKIBA and committed by
Ryusuke Konishi
4d3cf1bc e3154e97

+2 -1
+1
include/linux/magic.h
··· 23 23 #define XENFS_SUPER_MAGIC 0xabba1974 24 24 #define EXT4_SUPER_MAGIC 0xEF53 25 25 #define BTRFS_SUPER_MAGIC 0x9123683E 26 + #define NILFS_SUPER_MAGIC 0x3434 26 27 #define HPFS_SUPER_MAGIC 0xf995e849 27 28 #define ISOFS_SUPER_MAGIC 0x9660 28 29 #define JFFS2_SUPER_MAGIC 0x72b6
+1 -1
include/linux/nilfs2_fs.h
··· 40 40 41 41 #include <linux/types.h> 42 42 #include <linux/ioctl.h> 43 + #include <linux/magic.h> 43 44 44 45 45 46 #define NILFS_INODE_BMAP_SIZE 7 ··· 243 242 #define NILFS_USER_INO 11 /* Fisrt user's file inode number */ 244 243 245 244 #define NILFS_SB_OFFSET_BYTES 1024 /* byte offset of nilfs superblock */ 246 - #define NILFS_SUPER_MAGIC 0x3434 /* NILFS filesystem magic number */ 247 245 248 246 #define NILFS_SEG_MIN_BLOCKS 16 /* Minimum number of blocks in 249 247 a full segment */