diff options
| author | Piotr Sarna <p.sarna@partner.samsung.com> | 2013-08-09 05:02:24 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-08-09 05:02:24 +0200 |
| commit | 6ae6514b33f941d3386da0dfbe2942766eab1577 (patch) | |
| tree | 5ec35d334a0c91fd656d99c8b560eaea5dfca41c /fs/ext4/ioctl.c | |
| parent | ext4: allow the mount options nodelalloc and data=journal (diff) | |
| download | linux-6ae6514b33f941d3386da0dfbe2942766eab1577.tar.xz linux-6ae6514b33f941d3386da0dfbe2942766eab1577.zip | |
ext4: fix mount/remount error messages for incompatible mount options
Commit 5688978 ("ext4: improve handling of conflicting mount options")
introduced incorrect messages shown while choosing wrong mount options.
First of all, 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>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4/ioctl.c')
0 files changed, 0 insertions, 0 deletions