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

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

f2fs: inject fault to kzalloc 



This patch introduces f2fs_kzalloc based on f2fs_kmalloc in order to
support error injection for kzalloc().

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

fs/f2fs/checkpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	block_t cp_blk_no;

	int i;



	sbi->ckpt = kzalloc(cp_blks * blk_size, GFP_KERNEL);

	sbi->ckpt = f2fs_kzalloc(sbi, cp_blks * blk_size, GFP_KERNEL);

	if (!sbi->ckpt)

		return -ENOMEM;

	/*

fs/f2fs/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi) 
	struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);

	struct f2fs_stat_info *si;



	si = kzalloc(sizeof(struct f2fs_stat_info), GFP_KERNEL);

	si = f2fs_kzalloc(sbi, sizeof(struct f2fs_stat_info), GFP_KERNEL);

	if (!si)

		return -ENOMEM;

fs/f2fs/f2fs.h

+6 −0
Original line number Diff line number Diff line
@@ -2547,6 +2547,12 @@ enum rw_hint { 
	WRITE_LIFE_EXTREME	= 5, /* RWH_WRITE_LIFE_EXTREME */

};



static inline void *f2fs_kzalloc(struct f2fs_sb_info *sbi,

					size_t size, gfp_t flags)

{

	return f2fs_kmalloc(sbi, size, flags | __GFP_ZERO);

}



static inline int get_extra_isize(struct inode *inode)

{

	return F2FS_I(inode)->i_extra_isize / sizeof(__le32);

fs/f2fs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, 
		struct qstr istr = QSTR_INIT(symname, len);

		struct fscrypt_str ostr;



		sd = kzalloc(disk_link.len, GFP_NOFS);

		sd = f2fs_kzalloc(sbi, disk_link.len, GFP_NOFS);

		if (!sd) {

			err = -ENOMEM;

			goto err_out;

fs/f2fs/node.c

+4 −3
Original line number Diff line number Diff line
@@ -2604,8 +2604,8 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi) 


	nm_i->nat_bits_blocks = F2FS_BYTES_TO_BLK((nat_bits_bytes << 1) + 8 +

						F2FS_BLKSIZE - 1);

	nm_i->nat_bits = kzalloc(nm_i->nat_bits_blocks << F2FS_BLKSIZE_BITS,

						GFP_KERNEL);

	nm_i->nat_bits = f2fs_kzalloc(sbi,

			nm_i->nat_bits_blocks << F2FS_BLKSIZE_BITS, GFP_KERNEL);

	if (!nm_i->nat_bits)

		return -ENOMEM;
@@ -2751,7 +2751,8 @@ int build_node_manager(struct f2fs_sb_info *sbi) 
{

	int err;



	sbi->nm_info = kzalloc(sizeof(struct f2fs_nm_info), GFP_KERNEL);

	sbi->nm_info = f2fs_kzalloc(sbi, sizeof(struct f2fs_nm_info),

							GFP_KERNEL);

	if (!sbi->nm_info)

		return -ENOMEM;