Unverified Commit 8746c3d1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14515 hfsplus: don't query the device logical block size multiple times 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Zhongjin <chenzhongjin@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/TLK5U3BRJNS2QYL3LQI4SYYWJPD5RCOW/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEADN 
 
Link:https://gitee.com/openeuler/kernel/pulls/14515

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 37de49c6 9540df3e

fs/hfsplus/hfsplus_fs.h

+2 −1
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ struct hfsplus_sb_info { 


	/* Runtime variables */

	u32 blockoffset;

	u32 min_io_size;

	sector_t part_start;

	sector_t sect_count;

	int fs_shift;
@@ -306,7 +307,7 @@ struct hfsplus_readdir_data { 
 */

static inline unsigned short hfsplus_min_io_size(struct super_block *sb)

{

	return max_t(unsigned short, bdev_logical_block_size(sb->s_bdev),

	return max_t(unsigned short, HFSPLUS_SB(sb)->min_io_size,

		     HFSPLUS_SECTOR_SIZE);

}

fs/hfsplus/wrapper.c

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ int hfsplus_read_wrapper(struct super_block *sb) 
	if (!blocksize)

		goto out;



	sbi->min_io_size = blocksize;



	if (hfsplus_get_last_session(sb, &part_start, &part_size))

		goto out;