From 5d8ccd53ac05b0c2cf1334a92fb084dc9729e41c Mon Sep 17 00:00:00 2001 From: mtk81325 Date: Mon, 13 Jul 2020 14:56:24 +0800 Subject: [PATCH] ANDROID: Incremental fs: magic number compatible 32-bit Incfs's magic is bigger than 32-bit, but super block structure's s_magic is unsigned long which is 32-bit in ARM 32-bit platform. Do the cast for magic! Bug: 159772865 Signed-off-by: Peng Zhou Signed-off-by: mtk81325 Signed-off-by: Paul Lawrence Change-Id: Iae4f38774440c7d6ae44529d4f0f8ebb2ec5dacc --- fs/incfs/vfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/incfs/vfs.c b/fs/incfs/vfs.c index 582448ccdaef..abd38b2695e8 100644 --- a/fs/incfs/vfs.c +++ b/fs/incfs/vfs.c @@ -2178,7 +2178,7 @@ struct dentry *incfs_mount_fs(struct file_system_type *type, int flags, sb->s_op = &incfs_super_ops; sb->s_d_op = &incfs_dentry_ops; sb->s_flags |= S_NOATIME; - sb->s_magic = INCFS_MAGIC_NUMBER; + sb->s_magic = (long)INCFS_MAGIC_NUMBER; sb->s_time_gran = 1; sb->s_blocksize = INCFS_DATA_FILE_BLOCK_SIZE; sb->s_blocksize_bits = blksize_bits(sb->s_blocksize);