aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nilfs2_fs.h
diff options
context:
space:
mode:
authorJiro SEKIBA <jir@unicus.jp>2011-03-10 02:54:15 -0500
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2011-03-10 03:29:40 -0500
commit4d3cf1bc557dc8b88e1cabf1980b3baa3380a641 (patch)
tree7a35e25da0a998b148149a108ff40f1a2d4f8e52 /include/linux/nilfs2_fs.h
parente3154e9748f0f337e9f6ff9dc7d7bf24d426bd1a (diff)
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>
Diffstat (limited to 'include/linux/nilfs2_fs.h')
-rw-r--r--include/linux/nilfs2_fs.h2
1 files changed, 1 insertions, 1 deletions
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 @@
40 40
41#include <linux/types.h> 41#include <linux/types.h>
42#include <linux/ioctl.h> 42#include <linux/ioctl.h>
43#include <linux/magic.h>
43 44
44 45
45#define NILFS_INODE_BMAP_SIZE 7 46#define NILFS_INODE_BMAP_SIZE 7
@@ -242,7 +243,6 @@ struct nilfs_super_block {
242#define NILFS_USER_INO 11 /* Fisrt user's file inode number */ 243#define NILFS_USER_INO 11 /* Fisrt user's file inode number */
243 244
244#define NILFS_SB_OFFSET_BYTES 1024 /* byte offset of nilfs superblock */ 245#define NILFS_SB_OFFSET_BYTES 1024 /* byte offset of nilfs superblock */
245#define NILFS_SUPER_MAGIC 0x3434 /* NILFS filesystem magic number */
246 246
247#define NILFS_SEG_MIN_BLOCKS 16 /* Minimum number of blocks in 247#define NILFS_SEG_MIN_BLOCKS 16 /* Minimum number of blocks in
248 a full segment */ 248 a full segment */