Commit c40e15a9 authored by Yangtao Li's avatar Yangtao Li Committed by Jaegeuk Kim
Browse files

f2fs: merge f2fs_show_injection_info() into time_to_inject() 



There is no need to additionally use f2fs_show_injection_info()
to output information. Concatenate time_to_inject() and
__time_to_inject() via a macro. In the new __time_to_inject()
function, pass in the caller function name and parent function.

In this way, we no longer need the f2fs_show_injection_info() function,
and let's remove it.

Suggested-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 1cd75654

fs/f2fs/checkpoint.c

+1 −4
Original line number Diff line number Diff line
@@ -171,10 +171,8 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr, 
bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,

					block_t blkaddr, int type)

{

	if (time_to_inject(sbi, FAULT_BLKADDR)) {

		f2fs_show_injection_info(sbi, FAULT_BLKADDR);

	if (time_to_inject(sbi, FAULT_BLKADDR))

		return false;

	}



	switch (type) {

	case META_NAT:
@@ -622,7 +620,6 @@ int f2fs_acquire_orphan_inode(struct f2fs_sb_info *sbi) 


	if (time_to_inject(sbi, FAULT_ORPHAN)) {

		spin_unlock(&im->ino_lock);

		f2fs_show_injection_info(sbi, FAULT_ORPHAN);

		return -ENOSPC;

	}

fs/f2fs/data.c

+2 −6
Original line number Diff line number Diff line
@@ -295,10 +295,8 @@ static void f2fs_read_end_io(struct bio *bio) 
	iostat_update_and_unbind_ctx(bio, 0);

	ctx = bio->bi_private;



	if (time_to_inject(sbi, FAULT_READ_IO)) {

		f2fs_show_injection_info(sbi, FAULT_READ_IO);

	if (time_to_inject(sbi, FAULT_READ_IO))

		bio->bi_status = BLK_STS_IOERR;

	}



	if (bio->bi_status) {

		f2fs_finish_read_bio(bio, intask);
@@ -335,10 +333,8 @@ static void f2fs_write_end_io(struct bio *bio) 
	iostat_update_and_unbind_ctx(bio, 1);

	sbi = bio->bi_private;



	if (time_to_inject(sbi, FAULT_WRITE_IO)) {

		f2fs_show_injection_info(sbi, FAULT_WRITE_IO);

	if (time_to_inject(sbi, FAULT_WRITE_IO))

		bio->bi_status = BLK_STS_IOERR;

	}



	bio_for_each_segment_all(bvec, bio, iter_all) {

		struct page *page = bvec->bv_page;

fs/f2fs/dir.c

+1 −3
Original line number Diff line number Diff line
@@ -732,10 +732,8 @@ int f2fs_add_regular_entry(struct inode *dir, const struct f2fs_filename *fname, 
	}



start:

	if (time_to_inject(F2FS_I_SB(dir), FAULT_DIR_DEPTH)) {

		f2fs_show_injection_info(F2FS_I_SB(dir), FAULT_DIR_DEPTH);

	if (time_to_inject(F2FS_I_SB(dir), FAULT_DIR_DEPTH))

		return -ENOSPC;

	}



	if (unlikely(current_depth == MAX_DIR_HASH_DEPTH))

		return -ENOSPC;

fs/f2fs/f2fs.h

+14 −30
Original line number Diff line number Diff line
@@ -1867,12 +1867,10 @@ struct f2fs_sb_info { 
};



#ifdef CONFIG_F2FS_FAULT_INJECTION

#define f2fs_show_injection_info(sbi, type)					\

	printk_ratelimited("%sF2FS-fs (%s) : inject %s in %s of %pS\n",	\

		KERN_INFO, sbi->sb->s_id,				\

		f2fs_fault_name[type],					\

		__func__, __builtin_return_address(0))

static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type)

#define time_to_inject(sbi, type) __time_to_inject(sbi, type, __func__,	\

									__builtin_return_address(0))

static inline bool __time_to_inject(struct f2fs_sb_info *sbi, int type,

				const char *func, const char *parent_func)

{

	struct f2fs_fault_info *ffi = &F2FS_OPTION(sbi).fault_info;
@@ -1885,12 +1883,14 @@ static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type) 
	atomic_inc(&ffi->inject_ops);

	if (atomic_read(&ffi->inject_ops) >= ffi->inject_rate) {

		atomic_set(&ffi->inject_ops, 0);

		printk_ratelimited("%sF2FS-fs (%s) : inject %s in %s of %pS\n",

			KERN_INFO, sbi->sb->s_id, f2fs_fault_name[type],

			func, parent_func);

		return true;

	}

	return false;

}

#else

#define f2fs_show_injection_info(sbi, type) do { } while (0)

static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type)

{

	return false;
@@ -2223,10 +2223,8 @@ static inline void f2fs_lock_op(struct f2fs_sb_info *sbi) 


static inline int f2fs_trylock_op(struct f2fs_sb_info *sbi)

{

	if (time_to_inject(sbi, FAULT_LOCK_OP)) {

		f2fs_show_injection_info(sbi, FAULT_LOCK_OP);

	if (time_to_inject(sbi, FAULT_LOCK_OP))

		return 0;

	}

	return f2fs_down_read_trylock(&sbi->cp_rwsem);

}
@@ -2314,7 +2312,6 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi, 
		return ret;



	if (time_to_inject(sbi, FAULT_BLOCK)) {

		f2fs_show_injection_info(sbi, FAULT_BLOCK);

		release = *count;

		goto release_quota;

	}
@@ -2594,10 +2591,8 @@ static inline int inc_valid_node_count(struct f2fs_sb_info *sbi, 
			return err;

	}



	if (time_to_inject(sbi, FAULT_BLOCK)) {

		f2fs_show_injection_info(sbi, FAULT_BLOCK);

	if (time_to_inject(sbi, FAULT_BLOCK))

		goto enospc;

	}



	spin_lock(&sbi->stat_lock);
@@ -2721,12 +2716,9 @@ static inline struct page *f2fs_grab_cache_page(struct address_space *mapping, 
		if (page)

			return page;



		if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_ALLOC)) {

			f2fs_show_injection_info(F2FS_M_SB(mapping),

							FAULT_PAGE_ALLOC);

		if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_ALLOC))

			return NULL;

	}

	}



	if (!for_write)

		return grab_cache_page(mapping, index);
@@ -2742,10 +2734,8 @@ static inline struct page *f2fs_pagecache_get_page( 
				struct address_space *mapping, pgoff_t index,

				int fgp_flags, gfp_t gfp_mask)

{

	if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_GET)) {

		f2fs_show_injection_info(F2FS_M_SB(mapping), FAULT_PAGE_GET);

	if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_GET))

		return NULL;

	}



	return pagecache_get_page(mapping, index, fgp_flags, gfp_mask);

}
@@ -2795,10 +2785,8 @@ static inline void *f2fs_kmem_cache_alloc(struct kmem_cache *cachep, 
	if (nofail)

		return f2fs_kmem_cache_alloc_nofail(cachep, flags);



	if (time_to_inject(sbi, FAULT_SLAB_ALLOC)) {

		f2fs_show_injection_info(sbi, FAULT_SLAB_ALLOC);

	if (time_to_inject(sbi, FAULT_SLAB_ALLOC))

		return NULL;

	}



	return kmem_cache_alloc(cachep, flags);

}
@@ -3372,10 +3360,8 @@ static inline bool is_dot_dotdot(const u8 *name, size_t len) 
static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi,

					size_t size, gfp_t flags)

{

	if (time_to_inject(sbi, FAULT_KMALLOC)) {

		f2fs_show_injection_info(sbi, FAULT_KMALLOC);

	if (time_to_inject(sbi, FAULT_KMALLOC))

		return NULL;

	}



	return kmalloc(size, flags);

}
@@ -3389,10 +3375,8 @@ static inline void *f2fs_kzalloc(struct f2fs_sb_info *sbi, 
static inline void *f2fs_kvmalloc(struct f2fs_sb_info *sbi,

					size_t size, gfp_t flags)

{

	if (time_to_inject(sbi, FAULT_KVMALLOC)) {

		f2fs_show_injection_info(sbi, FAULT_KVMALLOC);

	if (time_to_inject(sbi, FAULT_KVMALLOC))

		return NULL;

	}



	return kvmalloc(size, flags);

}

fs/f2fs/file.c

+1 −3
Original line number Diff line number Diff line
@@ -782,10 +782,8 @@ int f2fs_truncate(struct inode *inode) 


	trace_f2fs_truncate(inode);



	if (time_to_inject(F2FS_I_SB(inode), FAULT_TRUNCATE)) {

		f2fs_show_injection_info(F2FS_I_SB(inode), FAULT_TRUNCATE);

	if (time_to_inject(F2FS_I_SB(inode), FAULT_TRUNCATE))

		return -EIO;

	}



	err = f2fs_dquot_initialize(inode);

	if (err)