Now since all preparations is done, we can move the DIOREAD_NOLOCK setting to ext4_set_def_opts(). Suggested-by: Ritesh Harjani (IBM) <ritesh.list@xxxxxxxxx> Signed-off-by: Jason Yan <yanaijie@xxxxxxxxxx> --- fs/ext4/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 25813758a53c..8624cc30c18b 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4364,6 +4364,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) @@ -5109,9 +5112,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; -- 2.31.1
