Commit 3df11e27 authored by Jason Yan's avatar Jason Yan Committed by Theodore Ts'o
Browse files

ext4: move DIOREAD_NOLOCK setting to ext4_set_def_opts() 



Now since all preparations is done, we can move the DIOREAD_NOLOCK
setting to ext4_set_def_opts().

Suggested-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220916141527.1012715-17-yanaijie@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent c8267c51

fs/ext4/super.c

+3 −3
Original line number Diff line number Diff line
@@ -4335,6 +4335,9 @@ static void ext4_set_def_opts(struct super_block *sb, 
	if (!IS_EXT3_SB(sb) && !IS_EXT2_SB(sb) &&

	    ((def_mount_opts & EXT4_DEFM_NODELALLOC) == 0))

		set_opt(sb, DELALLOC);



	if (sb->s_blocksize == PAGE_SIZE)

		set_opt(sb, DIOREAD_NOLOCK);

}



static int ext4_handle_clustersize(struct super_block *sb)
@@ -5080,9 +5083,6 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) 
	 */

	sbi->s_li_wait_mult = EXT4_DEF_LI_WAIT_MULT;



	if (sb->s_blocksize == PAGE_SIZE)

		set_opt(sb, DIOREAD_NOLOCK);



	if (ext4_inode_info_init(sb, es))

		goto failed_mount;