| Message ID | 20230319075130.24962-1-frank.li@vivo.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2f3d837dbaa0c16cfe41620f738d9bca008b0b69 |
| Headers | show |
| Series | [f2fs-dev,v2] f2fs: add compression feature check for all compress mount opt | expand |
On 2023/3/19 15:51, Yangtao Li wrote: > Opt_compress_chksum, Opt_compress_mode and Opt_compress_cache > lack the necessary check to see if the image supports compression, > let's add it. > > Signed-off-by: Yangtao Li <frank.li@vivo.com> Reviewed-by: Chao Yu <chao@kernel.org> Thanks,
Hello: This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <jaegeuk@kernel.org>: On Sun, 19 Mar 2023 15:51:30 +0800 you wrote: > Opt_compress_chksum, Opt_compress_mode and Opt_compress_cache > lack the necessary check to see if the image supports compression, > let's add it. > > Signed-off-by: Yangtao Li <frank.li@vivo.com> > --- > v2: > -drop f2fs_mount_opt_need_skip() > fs/f2fs/super.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) Here is the summary with links: - [f2fs-dev,v2] f2fs: add compression feature check for all compress mount opt https://git.kernel.org/jaegeuk/f2fs/c/2f3d837dbaa0 You are awesome, thank you!
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 9c87d91df61b..a88706bbfc0d 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1179,9 +1179,17 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) kfree(name); break; case Opt_compress_chksum: + if (!f2fs_sb_has_compression(sbi)) { + f2fs_info(sbi, "Image doesn't support compression"); + break; + } F2FS_OPTION(sbi).compress_chksum = true; break; case Opt_compress_mode: + if (!f2fs_sb_has_compression(sbi)) { + f2fs_info(sbi, "Image doesn't support compression"); + break; + } name = match_strdup(&args[0]); if (!name) return -ENOMEM; @@ -1196,6 +1204,10 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) kfree(name); break; case Opt_compress_cache: + if (!f2fs_sb_has_compression(sbi)) { + f2fs_info(sbi, "Image doesn't support compression"); + break; + } set_opt(sbi, COMPRESS_CACHE); break; #else
Opt_compress_chksum, Opt_compress_mode and Opt_compress_cache lack the necessary check to see if the image supports compression, let's add it. Signed-off-by: Yangtao Li <frank.li@vivo.com> --- v2: -drop f2fs_mount_opt_need_skip() fs/f2fs/super.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)