Move the 32bit statfs f_type magic number to proper place. CC: Joern Engel <joern@xxxxxxxxx> Signed-off-by: Karel Zak <kzak@xxxxxxxxxx> --- fs/logfs/logfs_abi.h | 7 +++++-- fs/logfs/super.c | 2 +- include/uapi/linux/magic.h | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/logfs/logfs_abi.h b/fs/logfs/logfs_abi.h index ae96051..afa7922 100644 --- a/fs/logfs/logfs_abi.h +++ b/fs/logfs/logfs_abi.h @@ -60,9 +60,12 @@ static inline void check_##type(void) \ */ -/* Magic numbers. 64bit for superblock, 32bit for statfs f_type */ +/* + * Magic numbers. + * + * 64bit for superblock, 32bit for statfs f_type defined in linux/magic.h + */ #define LOGFS_MAGIC 0x7a3a8e5cb9d5bf67ull -#define LOGFS_MAGIC_U32 0xc97e8168u /* * Various blocksize related macros. Blocksize is currently fixed at 4KiB. diff --git a/fs/logfs/super.c b/fs/logfs/super.c index 5436029..0b84753 100644 --- a/fs/logfs/super.c +++ b/fs/logfs/super.c @@ -99,7 +99,7 @@ int logfs_statfs(struct dentry *dentry, struct kstatfs *stats) struct super_block *sb = dentry->d_sb; struct logfs_super *super = logfs_super(sb); - stats->f_type = LOGFS_MAGIC_U32; + stats->f_type = LOGFS_FTYPE_MAGIC; stats->f_bsize = sb->s_blocksize; stats->f_blocks = super->s_size >> LOGFS_BLOCK_BITS >> 3; stats->f_bfree = super->s_free_bytes >> sb->s_blocksize_bits; diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 7898d5d..a102467 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -46,6 +46,8 @@ #define VXFS_SUPER_MAGIC 0xa501FCF5 #define XFS_SUPER_MAGIC 0x58465342 +#define LOGFS_FTYPE_MAGIC 0xc97e8168 + #define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */ #define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */ #define MINIX2_SUPER_MAGIC 0x2468 /* minix v2 fs, 14 char names */ -- 1.8.5.3 -- 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
