| Message ID | 1586751862-19437-1-git-send-email-kaixuxia@tencent.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ext4: remove unnecessary test_opt for DIOREAD_NOLOCK | expand |
On 4/13/20 9:54 AM, xiakaixu1987@gmail.com wrote: > From: Kaixu Xia <kaixuxia@tencent.com> > > 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> Make sense. Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com> > --- > 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"); >
On Mon, Apr 13, 2020 at 12:24:22PM +0800, xiakaixu1987@gmail.com wrote: > From: Kaixu Xia <kaixuxia@tencent.com> > > 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> Applied, thanks. - Ted
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");