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

Commit 33c54d58 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jaegeuk Kim
Browse files

f2fs: rework fault injection handling to avoid a warning 



When CONFIG_F2FS_FAULT_INJECTION is disabled, we get a warning about an
unused label:

fs/f2fs/segment.c: In function '__submit_discard_cmd':
fs/f2fs/segment.c:1059:1: error: label 'submit' defined but not used [-Werror=unused-label]

This could be fixed by adding another #ifdef around it, but the more
reliable way of doing this seems to be to remove the other #ifdefs
where that is easily possible.

By defining time_to_inject() as a trivial stub, most of the checks for
CONFIG_F2FS_FAULT_INJECTION can go away. This also leads to nicer
formatting of the code.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 0ef692e0

fs/f2fs/checkpoint.c

+1 −2
Original line number Diff line number Diff line
@@ -555,13 +555,12 @@ int f2fs_acquire_orphan_inode(struct f2fs_sb_info *sbi) 


	spin_lock(&im->ino_lock);



#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_ORPHAN)) {

		spin_unlock(&im->ino_lock);

		f2fs_show_injection_info(FAULT_ORPHAN);

		return -ENOSPC;

	}

#endif



	if (unlikely(im->ino_num >= sbi->max_orphans))

		err = -ENOSPC;

	else

fs/f2fs/data.c

+0 −2
Original line number Diff line number Diff line
@@ -125,12 +125,10 @@ static bool f2fs_bio_post_read_required(struct bio *bio) 


static void f2fs_read_end_io(struct bio *bio)

{

#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(F2FS_P_SB(bio->bi_io_vec->bv_page), FAULT_IO)) {

		f2fs_show_injection_info(FAULT_IO);

		bio->bi_error = -EIO;

	}

#endif



	if (f2fs_bio_post_read_required(bio)) {

		struct bio_post_read_ctx *ctx = bio->bi_private;

fs/f2fs/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -517,12 +517,11 @@ int f2fs_add_regular_entry(struct inode *dir, const struct qstr *new_name, 
	}



start:

#ifdef CONFIG_F2FS_FAULT_INJECTION

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

		f2fs_show_injection_info(FAULT_DIR_DEPTH);

		return -ENOSPC;

	}

#endif



	if (unlikely(current_depth == MAX_DIR_HASH_DEPTH))

		return -ENOSPC;

fs/f2fs/f2fs.h

+25 −25
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
	} while (0)

#endif



#ifdef CONFIG_F2FS_FAULT_INJECTION

enum {

	FAULT_KMALLOC,

	FAULT_KVMALLOC,
@@ -62,6 +61,7 @@ enum { 
	FAULT_MAX,

};



#ifdef CONFIG_F2FS_FAULT_INJECTION

#define F2FS_ALL_FAULT_TYPE		((1 << FAULT_MAX) - 1)



struct f2fs_fault_info {
@@ -1323,6 +1323,12 @@ static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type) 
	}

	return false;

}

#else

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

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

{

	return false;

}

#endif



/* For write statistics. Suppose sector size is 512 bytes,
@@ -1675,13 +1681,12 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi, 
	if (ret)

		return ret;



#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_BLOCK)) {

		f2fs_show_injection_info(FAULT_BLOCK);

		release = *count;

		goto enospc;

	}

#endif



	/*

	 * let's increase this in prior to actual block count change in order

	 * for f2fs_sync_file to avoid data races when deciding checkpoint.
@@ -1890,12 +1895,10 @@ static inline int inc_valid_node_count(struct f2fs_sb_info *sbi, 
			return ret;

	}



#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_BLOCK)) {

		f2fs_show_injection_info(FAULT_BLOCK);

		goto enospc;

	}

#endif



	spin_lock(&sbi->stat_lock);
@@ -1980,9 +1983,9 @@ static inline s64 valid_inode_count(struct f2fs_sb_info *sbi) 
static inline struct page *f2fs_grab_cache_page(struct address_space *mapping,

						pgoff_t index, bool for_write)

{

#ifdef CONFIG_F2FS_FAULT_INJECTION

	struct page *page;



	if (IS_ENABLED(CONFIG_F2FS_FAULT_INJECTION)) {

		if (!for_write)

			page = find_get_page_flags(mapping, index,

							FGP_LOCK | FGP_ACCESSED);
@@ -1995,7 +1998,8 @@ static inline struct page *f2fs_grab_cache_page(struct address_space *mapping, 
			f2fs_show_injection_info(FAULT_PAGE_ALLOC);

			return NULL;

		}

#endif

	}



	if (!for_write)

		return grab_cache_page(mapping, index);

	return grab_cache_page_write_begin(mapping, index, AOP_FLAG_NOFS);
@@ -2005,12 +2009,11 @@ static inline struct page *f2fs_pagecache_get_page( 
				struct address_space *mapping, pgoff_t index,

				int fgp_flags, gfp_t gfp_mask)

{

#ifdef CONFIG_F2FS_FAULT_INJECTION

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

		f2fs_show_injection_info(FAULT_PAGE_GET);

		return NULL;

	}

#endif



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

}
@@ -2075,12 +2078,11 @@ static inline struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, 
			bio = bio_alloc(GFP_NOIO | __GFP_NOFAIL, npages);

		return bio;

	}

#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_ALLOC_BIO)) {

		f2fs_show_injection_info(FAULT_ALLOC_BIO);

		return NULL;

	}

#endif



	return bio_alloc(GFP_KERNEL, npages);

}
@@ -2615,12 +2617,11 @@ static inline bool f2fs_may_extent_tree(struct inode *inode) 
static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi,

					size_t size, gfp_t flags)

{

#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_KMALLOC)) {

		f2fs_show_injection_info(FAULT_KMALLOC);

		return NULL;

	}

#endif



	return kmalloc(size, flags);

}
@@ -2663,12 +2664,11 @@ 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)

{

#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_KVMALLOC)) {

		f2fs_show_injection_info(FAULT_KVMALLOC);

		return NULL;

	}

#endif



	return kvmalloc(size, flags);

}

fs/f2fs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -670,12 +670,11 @@ int f2fs_truncate(struct inode *inode) 


	trace_f2fs_truncate(inode);



#ifdef CONFIG_F2FS_FAULT_INJECTION

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

		f2fs_show_injection_info(FAULT_TRUNCATE);

		return -EIO;

	}

#endif



	/* we should check inline_data size */

	if (!f2fs_may_inline_data(inode)) {

		err = f2fs_convert_inline_inode(inode);