Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3acc2f31 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: spread f2fs_k{m,z}alloc 



Use f2fs_k{m,z}alloc as much as possible to increase fault injection
points.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 8c72d9db

fs/f2fs/segment.c

+1 −1
Original line number Diff line number Diff line
@@ -3545,7 +3545,7 @@ static int build_curseg(struct f2fs_sb_info *sbi) 
	struct curseg_info *array;

	int i;



	array = kcalloc(NR_CURSEG_TYPE, sizeof(*array), GFP_KERNEL);

	array = f2fs_kzalloc(sbi, sizeof(*array) * NR_CURSEG_TYPE, GFP_KERNEL);

	if (!array)

		return -ENOMEM;

fs/f2fs/super.c

+9 −7
Original line number Diff line number Diff line
@@ -2200,14 +2200,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;
@@ -2351,8 +2352,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;
@@ -2560,7 +2561,8 @@ try_onemore: 
		int n = (i == META) ? 1: NR_TEMP_TYPE;

		int j;



		sbi->write_io[i] = kmalloc(n * sizeof(struct f2fs_bio_info),

		sbi->write_io[i] = f2fs_kmalloc(sbi,

					n * sizeof(struct f2fs_bio_info),

					GFP_KERNEL);

		if (!sbi->write_io[i]) {

			err = -ENOMEM;