f2fs: compress: add sanity check during compressed cluster read
Chao Yu
maintainerPATCH 1/2 f2fs: compress: add sanity check during compressed cluster read
From: Chao Yu <[email protected]>
In f2fs_read_multi_pages(), we don't have to check cluster's type again, since overwrite or partial truncation need page lock in cluster which has already been held by reader, so cluster's type is stable, let's change check condition to sanity check.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/data.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/f2fs/data.c +1 -3
@@ -2170,9 +2170,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,if (ret) goto out; -/* cluster was overwritten as normal cluster */ -if (dn.data_blkaddr !=COMPRESS_ADDR ) - goto out; +f2fs_bug_on (sbi, dn.data_blkaddr !=COMPRESS_ADDR );for (i =1 ; i < cc->cluster_size; i++) {block_t blkaddr;
Signature · 1 line
2.22.0
Chao Yu
maintainerPATCH 2/2 f2fs: compress: disable compression mount option if compression is off
From: Chao Yu <[email protected]>
If CONFIG_F2FS_FS_COMPRESSION is off, don't allow to configure or show compression related mount option.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/super.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
fs/f2fs/super.c +14 -1
@@ -460,9 +460,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) {struct f2fs_sb_info *sbi =F2FS_SB (sb);substring_t args[MAX_OPT_ARGS ]; +#ifdef CONFIG_F2FS_FS_COMPRESSION unsigned char (*ext)[F2FS_EXTENSION_LEN ]; +int ext_cnt; +#endif char *p, *name; -int arg =0 , ext_cnt; +int arg =0 ;kuid_t uid;kgid_t gid;int ret;
@@ -853,6 +856,7 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)case Opt_checkpoint_enable:clear_opt (sbi,DISABLE_CHECKPOINT );break ; +#ifdef CONFIG_F2FS_FS_COMPRESSION case Opt_compress_algorithm:if (!f2fs_sb_has_compression (sbi)) {f2fs_err (sbi,"Compression feature if off" );
@@ -918,6 +922,13 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)F2FS_OPTION (sbi).compress_ext_cnt++;kfree (name);break ; +#else +case Opt_compress_algorithm: +case Opt_compress_log_size: +case Opt_compress_extension: +f2fs_info (sbi,"compression options not supported" ); +break ; +#endif default :f2fs_err (sbi,"Unrecognized mount option \"%s\" or missing value" , p);
@@ -1608,7 +1619,9 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)else if (F2FS_OPTION (sbi).fsync_mode ==FSYNC_MODE_NOBARRIER )seq_printf (seq,",fsync_mode=%s" ,"nobarrier" ); +#ifdef CONFIG_F2FS_FS_COMPRESSION f2fs_show_compress_options (seq, sbi->sb); +#endif return 0 ; }
Signature · 1 line
2.22.0