On 4/13/20 9:54 AM, [email protected] wrote:
> From: Kaixu Xia <[email protected]>
>
> The DIOREAD_NOLOCK flag has been cleared when doing the test_opt
> that is meaningless, so remove the unnecessary test_opt for DIOREAD_NOLOCK.
>
> Signed-off-by: Kaixu Xia <[email protected]>
Make sense.
Reviewed-by: Ritesh Harjani <[email protected]>
> ---
> fs/ext4/super.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 9728e7b0e84f..855874ea4b29 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -3973,17 +3973,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
>
> if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA) {
> printk_once(KERN_WARNING "EXT4-fs: Warning: mounting with data=journal disables delayed allocation, dioread_nolock, and O_DIRECT support!\n");
> + /* can't mount with both data=journal and dioread_nolock. */
> clear_opt(sb, DIOREAD_NOLOCK);
> if (test_opt2(sb, EXPLICIT_DELALLOC)) {
> ext4_msg(sb, KERN_ERR, "can't mount with "
> "both data=journal and delalloc");
> goto failed_mount;
> }
> - if (test_opt(sb, DIOREAD_NOLOCK)) {
> - ext4_msg(sb, KERN_ERR, "can't mount with "
> - "both data=journal and dioread_nolock");
> - goto failed_mount;
> - }
> if (test_opt(sb, DAX)) {
> ext4_msg(sb, KERN_ERR, "can't mount with "
> "both data=journal and dax");
>