f2fs: fix to set flush_merge opt and show noflush_merge
authorYangtao Li <frank.li@vivo.com>
Thu, 10 Nov 2022 09:15:01 +0000 (17:15 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Aug 2023 10:08:26 +0000 (12:08 +0200)
commit6ba0594a81f91d6fd8ca9bd4ad23aa1618635a0f
treef84a9048c69f3391a225b9b10fd2959cb82fbb08
parente355972affb67aa2e9b6daa6d77008a6b88abcdf
f2fs: fix to set flush_merge opt and show noflush_merge

[ Upstream commit 967eaad1fed5f6335ea97a47d45214744dc57925 ]

Some minor modifications to flush_merge and related parameters:

  1.The FLUSH_MERGE opt is set by default only in non-ro mode.
  2.When ro and merge are set at the same time, an error is reported.
  3.Display noflush_merge mount opt.

Suggested-by: Chao Yu <chao@kernel.org>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: 458c15dfbce6 ("f2fs: don't reset unchangable mount option in f2fs_remount()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/f2fs/super.c