Commit 781c036b authored by Kaixu Xia's avatar Kaixu Xia Committed by Theodore Ts'o
Browse files

ext4: remove unnecessary test_opt for DIOREAD_NOLOCK 



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: default avatarKaixu Xia <kaixuxia@tencent.com>
Link: https://lore.kernel.org/r/1586751862-19437-1-git-send-email-kaixuxia@tencent.com


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

fs/ext4/super.c

+1 −5
Original line number Diff line number Diff line
@@ -3971,17 +3971,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");