diff options
| author | Chao Yu <yuchao0@huawei.com> | 2017-11-30 19:28:19 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-01-02 19:27:29 -0800 |
| commit | 4e6aad29bc8d5d56f053c9bb2fe7a5178ea6f3dc (patch) | |
| tree | 4baf89ffc1d69bb8b63c8e67c2e5c5423cb71a5e /fs/f2fs/super.c | |
| parent | 628b3d1438fbcb1f9e79472a0872a2c3018a48be (diff) | |
| download | linux-stable-4e6aad29bc8d5d56f053c9bb2fe7a5178ea6f3dc.tar.gz linux-stable-4e6aad29bc8d5d56f053c9bb2fe7a5178ea6f3dc.tar.bz2 linux-stable-4e6aad29bc8d5d56f053c9bb2fe7a5178ea6f3dc.zip | |
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: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/super.c')
| -rw-r--r-- | fs/f2fs/super.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 20935d10d8f1..2fabb131d385 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -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; |