From 0b1ff3b85e75f95f29e9c372d26c0b56cabedd7d Mon Sep 17 00:00:00 2001 From: yanyh2 Date: Mon, 25 Apr 2022 15:24:16 +0800 Subject: [PATCH] fix build err for new Kernel version moto_f_mass_storage.ko build error: storage_common.c:218:20: error: no member named 'i_bdev' in 'struct inode' Change-Id: I1d0bde9c0f60a8147ea4f8668cdc0240ed35ac3c Signed-off-by: yanyh2 Reviewed-on: https://gerrit.mot.com/2252051 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/moto_f_mass_storage/storage_common.c b/drivers/moto_f_mass_storage/storage_common.c index 822a725347d8..e3fbebfdd086 100644 --- a/drivers/moto_f_mass_storage/storage_common.c +++ b/drivers/moto_f_mass_storage/storage_common.c @@ -188,7 +188,7 @@ int fsg_lun_open(struct fsg_lun *curlun, const char *filename) if (!(filp->f_mode & FMODE_WRITE)) ro = 1; - inode = file_inode(filp); + inode = filp->f_mapping->host; if ((!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))) { LINFO(curlun, "invalid file type: %s\n", filename); goto out; @@ -205,7 +205,7 @@ int fsg_lun_open(struct fsg_lun *curlun, const char *filename) if (!(filp->f_mode & FMODE_CAN_WRITE)) ro = 1; - size = i_size_read(inode->i_mapping->host); + size = i_size_read(inode); if (size < 0) { LINFO(curlun, "unable to find file size: %s\n", filename); rc = (int) size; @@ -215,8 +215,8 @@ int fsg_lun_open(struct fsg_lun *curlun, const char *filename) if (curlun->cdrom) { blksize = 2048; blkbits = 11; - } else if (inode->i_bdev) { - blksize = bdev_logical_block_size(inode->i_bdev); + } else if (S_ISBLK(inode->i_mode)) { + blksize = bdev_logical_block_size(I_BDEV(inode)); blkbits = blksize_bits(blksize); } else { blksize = 512;