| From 1633d50abf6b8a43b7d9a3628e755e726914a052 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 22 Sep 2018 22:43:09 +0800 |
| Subject: f2fs: fix remount problem of option io_bits |
| |
| From: Chengguang Xu <cgxu519@gmx.com> |
| |
| [ Upstream commit c6b1867b1da3b1203b4c49988afeebdcbdf65499 ] |
| |
| Currently we show mount option "io_bits=%u" as "io_size=%uKB", |
| it will cause option parsing problem(unrecognized mount option) |
| in remount. |
| |
| Signed-off-by: Chengguang Xu <cgxu519@gmx.com> |
| Reviewed-by: Chao Yu <yuchao0@huawei.com> |
| Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/f2fs/super.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c |
| index c5d28e92d146e..b05e10c332b7e 100644 |
| --- a/fs/f2fs/super.c |
| +++ b/fs/f2fs/super.c |
| @@ -1336,7 +1336,8 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root) |
| from_kgid_munged(&init_user_ns, |
| F2FS_OPTION(sbi).s_resgid)); |
| if (F2FS_IO_SIZE_BITS(sbi)) |
| - seq_printf(seq, ",io_size=%uKB", F2FS_IO_SIZE_KB(sbi)); |
| + seq_printf(seq, ",io_bits=%u", |
| + F2FS_OPTION(sbi).write_io_size_bits); |
| #ifdef CONFIG_F2FS_FAULT_INJECTION |
| if (test_opt(sbi, FAULT_INJECTION)) { |
| seq_printf(seq, ",fault_injection=%u", |
| -- |
| 2.20.1 |
| |