ext4: remove unnecessary test_opt for DIOREAD_NOLOCK
authorKaixu Xia <kaixuxia@tencent.com>
Mon, 13 Apr 2020 04:24:22 +0000 (12:24 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 7 May 2020 15:00:47 +0000 (11:00 -0400)
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 <kaixuxia@tencent.com>
Link: https://lore.kernel.org/r/1586751862-19437-1-git-send-email-kaixuxia@tencent.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/super.c

index bf5fcb477f667211f031c6f1cff42f54a1a5235d..79e07e69cef988b01b6cea583293a7d373c0b68d 100644 (file)
@@ -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");