aboutsummaryrefslogtreecommitdiff
path: root/lib/debug_locks.c
diff options
context:
space:
mode:
authorPiotr Sarna <p.sarna@partner.samsung.com>2013-08-08 23:02:24 -0400
committerKamal Mostafa <kamal@canonical.com>2013-08-21 10:58:32 -0700
commitb5e15720f74760de783356ac8f8b2cb2ff9ed2d4 (patch)
tree48f7159c86ba61f5895a2e17b1d7f02e97f6099f /lib/debug_locks.c
parent70d22bd326fee909753388ae7d37d4a2692f8167 (diff)
ext4: fix mount/remount error messages for incompatible mount options
commit 6ae6514b33f941d3386da0dfbe2942766eab1577 upstream. 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> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Diffstat (limited to 'lib/debug_locks.c')
0 files changed, 0 insertions, 0 deletions