diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 65c5f05a1df6..1fd50434c08c 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -513,8 +513,9 @@ static int f2fs_compress_pages(struct compress_ctx *cc) max_len = COMPRESS_HEADER_SIZE + cc->clen; cc->nr_cpages = DIV_ROUND_UP(max_len, PAGE_SIZE); - cc->cpages = f2fs_kzalloc(sbi, sizeof(struct page *) * - cc->nr_cpages, GFP_NOFS); + cc->cpages = f2fs_kzalloc(sbi, + array_size(sizeof(struct page *), cc->nr_cpages), + GFP_NOFS); if (!cc->cpages) { ret = -ENOMEM; goto destroy_compress_ctx; @@ -1286,8 +1287,9 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc) dic->rpages[i] = cc->rpages[i]; dic->nr_rpages = cc->cluster_size; - dic->cpages = f2fs_kzalloc(sbi, sizeof(struct page *) * - dic->nr_cpages, GFP_NOFS); + dic->cpages = f2fs_kzalloc(sbi, + array_size(sizeof(struct page *), dic->nr_cpages), + GFP_NOFS); if (!dic->cpages) goto out_free; @@ -1303,8 +1305,9 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc) dic->cpages[i] = page; } - dic->tpages = f2fs_kzalloc(sbi, sizeof(struct page *) * - dic->cluster_size, GFP_NOFS); + dic->tpages = f2fs_kzalloc(sbi, + array_size(sizeof(struct page *), dic->cluster_size), + GFP_NOFS); if (!dic->tpages) goto out_free; diff --git a/fs/f2fs/hash.c b/fs/f2fs/hash.c index 5bc4dcd8fc03..af5855fbbb8d 100644 --- a/fs/f2fs/hash.c +++ b/fs/f2fs/hash.c @@ -118,7 +118,7 @@ f2fs_hash_t f2fs_dentry_hash(const struct inode *dir, if (!name_info->len || !IS_CASEFOLDED(dir)) goto opaque_seq; - buff = f2fs_kzalloc(sbi, sizeof(char) * PATH_MAX, GFP_KERNEL); + buff = f2fs_kzalloc(sbi, PATH_MAX, GFP_KERNEL); if (!buff) return -ENOMEM; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index a57fd30d6b84..3c6dbc0116bd 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -3033,8 +3033,7 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi) FDEV(devi).nr_blkz++; FDEV(devi).blkz_seq = f2fs_kzalloc(sbi, - BITS_TO_LONGS(FDEV(devi).nr_blkz) - * sizeof(unsigned long), + array_size(sizeof(unsigned long), BITS_TO_LONGS(FDEV(devi).nr_blkz)), GFP_KERNEL); if (!FDEV(devi).blkz_seq) return -ENOMEM;