On Thu, 10 Mar 2011 16:54:15 +0900, Jiro SEKIBA wrote:
> move NILFS_SUPER_MAGIC macro to linux/magic.h from linux/nilfs2_fs.h
> in the same manner as other filessytem magic number defined in the file.
>
> Signed-off-by: Jiro SEKIBA <jir@xxxxxxxxx>
All right, I'll take this through the nilfs tree.
Thanks,
Ryusuke Konishi
> ---
> include/linux/magic.h | 1 +
> 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 62730ea..248930e 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 ae33ac2..8768c46 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 */
> --
> 1.5.6.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
