| Message ID | 1375445027-25024-2-git-send-email-p.sarna@partner.samsung.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Aug 02, 2013 at 02:03:47PM +0200, Piotr Sarna wrote: > Commit 5688978 ("ext4: improve handling of conflicting mount options") > introduced incorrect messages shown while choosing wrong mount options. > > Firstly, both cases of incorrect mount options, "data=journal,delalloc" > and "data=journal,dioread_nolock" result in the same error message. > > Secondly, the problem above isn't solved for remount option: the mismatched > parameter is simply ignored. Moreover, ext4_msg states that remount > with options "data=journal,delalloc" succeeded, which is not true. > > To fix it up, I added a simple check after parse_options() call to ensure > that data=journal and delalloc/dioread_nolock parameters are not present > at the same time. > > Signed-off-by: Piotr Sarna <p.sarna@partner.samsung.com> > Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Applied, thanks. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 10f9bb0..ab0b23b 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3452,7 +3452,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) } if (test_opt(sb, DIOREAD_NOLOCK)) { ext4_msg(sb, KERN_ERR, "can't mount with " - "both data=journal and delalloc"); + "both data=journal and dioread_nolock"); goto failed_mount; } if (test_opt(sb, DELALLOC)) @@ -4653,6 +4653,21 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) goto restore_opts; } + if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA) { + if (test_opt2(sb, EXPLICIT_DELALLOC)) { + ext4_msg(sb, KERN_ERR, "can't mount with " + "both data=journal and delalloc"); + err = -EINVAL; + goto restore_opts; + } + if (test_opt(sb, DIOREAD_NOLOCK)) { + ext4_msg(sb, KERN_ERR, "can't mount with " + "both data=journal and dioread_nolock"); + err = -EINVAL; + goto restore_opts; + } + } + if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) ext4_abort(sb, "Abort forced by user");
Commit 5688978 ("ext4: improve handling of conflicting mount options") introduced incorrect messages shown while choosing wrong mount options. Firstly, both cases of incorrect mount options, "data=journal,delalloc" and "data=journal,dioread_nolock" result in the same error message. Secondly, the problem above isn't solved for remount option: the mismatched parameter is simply ignored. Moreover, ext4_msg states that remount with options "data=journal,delalloc" succeeded, which is not true. To fix it up, I added a simple check after parse_options() call to ensure that data=journal and delalloc/dioread_nolock parameters are not present at the same time. Signed-off-by: Piotr Sarna <p.sarna@partner.samsung.com> Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> --- fs/ext4/super.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)