|
@@ -2150,14 +2150,15 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi)
|
|
|
if (nr_sectors & (bdev_zone_sectors(bdev) - 1))
|
|
|
FDEV(devi).nr_blkz++;
|
|
|
|
|
|
- FDEV(devi).blkz_type = kmalloc(FDEV(devi).nr_blkz, GFP_KERNEL);
|
|
|
+ FDEV(devi).blkz_type = f2fs_kmalloc(sbi, FDEV(devi).nr_blkz,
|
|
|
+ GFP_KERNEL);
|
|
|
if (!FDEV(devi).blkz_type)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
#define F2FS_REPORT_NR_ZONES 4096
|
|
|
|
|
|
- zones = kcalloc(F2FS_REPORT_NR_ZONES, sizeof(struct blk_zone),
|
|
|
- GFP_KERNEL);
|
|
|
+ zones = f2fs_kzalloc(sbi, sizeof(struct blk_zone) *
|
|
|
+ F2FS_REPORT_NR_ZONES, GFP_KERNEL);
|
|
|
if (!zones)
|
|
|
return -ENOMEM;
|
|
|
|
|
@@ -2297,8 +2298,8 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
|
|
|
* Initialize multiple devices information, or single
|
|
|
* zoned block device information.
|
|
|
*/
|
|
|
- sbi->devs = kcalloc(max_devices, sizeof(struct f2fs_dev_info),
|
|
|
- GFP_KERNEL);
|
|
|
+ sbi->devs = f2fs_kzalloc(sbi, sizeof(struct f2fs_dev_info) *
|
|
|
+ max_devices, GFP_KERNEL);
|
|
|
if (!sbi->devs)
|
|
|
return -ENOMEM;
|
|
|
|
|
@@ -2504,8 +2505,9 @@ try_onemore:
|
|
|
int n = (i == META) ? 1: NR_TEMP_TYPE;
|
|
|
int j;
|
|
|
|
|
|
- sbi->write_io[i] = kmalloc(n * sizeof(struct f2fs_bio_info),
|
|
|
- GFP_KERNEL);
|
|
|
+ sbi->write_io[i] = f2fs_kmalloc(sbi,
|
|
|
+ n * sizeof(struct f2fs_bio_info),
|
|
|
+ GFP_KERNEL);
|
|
|
if (!sbi->write_io[i]) {
|
|
|
err = -ENOMEM;
|
|
|
goto free_options;
|