aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/hostap/hostap_ioctl.c
diff options
context:
space:
mode:
authorPiotr Sarna <p.sarna@partner.samsung.com>2013-08-08 23:02:24 -0400
committerBen Hutchings <ben@decadent.org.uk>2013-09-10 01:57:21 +0100
commita13fe4408d97fa1eb1063a852aeccc9ada65d8dc (patch)
tree9c5b0ba35fdaf7cd9979619b24aefcd106564cf4 /drivers/net/wireless/hostap/hostap_ioctl.c
parentc2d9f22ac7b0b4434df8cd12b6f857647d35c3b1 (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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ioctl.c')
0 files changed, 0 insertions, 0 deletions