From 35608bf0a0162a1d155dd2d6ca5d93915352ca5b Mon Sep 17 00:00:00 2001 From: yanyh2 Date: Tue, 26 Apr 2022 10:46:35 +0800 Subject: [PATCH] add kernel version check for I_BDEV As I_BDEV cannot be used in GKI build before kernel version 5.15, so add kernel version check when use I_BDEV. Change-Id: I7f02b64434559d4a1e00a2c8ea6b38bb1288957b Signed-off-by: yanyh2 Reviewed-on: https://gerrit.mot.com/2252790 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Jianqi Yang Submit-Approved: Jira Key --- drivers/moto_f_mass_storage/storage_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/moto_f_mass_storage/storage_common.c b/drivers/moto_f_mass_storage/storage_common.c index e3fbebfdd086..587f3eeae904 100644 --- a/drivers/moto_f_mass_storage/storage_common.c +++ b/drivers/moto_f_mass_storage/storage_common.c @@ -216,7 +216,11 @@ int fsg_lun_open(struct fsg_lun *curlun, const char *filename) blksize = 2048; blkbits = 11; } else if (S_ISBLK(inode->i_mode)) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) + blksize = bdev_logical_block_size(inode->i_bdev); +#else blksize = bdev_logical_block_size(I_BDEV(inode)); +#endif blkbits = blksize_bits(blksize); } else { blksize = 512;