mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
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: 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>
This commit is contained in:
parent
0e698dfa28
commit
781c036b67
1 changed files with 1 additions and 5 deletions
|
@ -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) {
|
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");
|
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);
|
clear_opt(sb, DIOREAD_NOLOCK);
|
||||||
if (test_opt2(sb, EXPLICIT_DELALLOC)) {
|
if (test_opt2(sb, EXPLICIT_DELALLOC)) {
|
||||||
ext4_msg(sb, KERN_ERR, "can't mount with "
|
ext4_msg(sb, KERN_ERR, "can't mount with "
|
||||||
"both data=journal and delalloc");
|
"both data=journal and delalloc");
|
||||||
goto failed_mount;
|
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)) {
|
if (test_opt(sb, DAX)) {
|
||||||
ext4_msg(sb, KERN_ERR, "can't mount with "
|
ext4_msg(sb, KERN_ERR, "can't mount with "
|
||||||
"both data=journal and dax");
|
"both data=journal and dax");
|
||||||
|
|
Loading…
Reference in a new issue