Skip to content

Commit

Permalink
f2fs: rework fault injection handling to avoid a warning
Browse files Browse the repository at this point in the history 
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: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: khusika <khusikadhamar@gmail.com>
  • Loading branch information
@arndb @khusika
arndb authored and khusika committed Oct 13, 2018
1 parent 6646af1 commit 275c76d
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 46 deletions.
3 changes: 1 addition & 2 deletions fs/f2fs/checkpoint.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,13 +556,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
Expand Down
2 changes: 0 additions & 2 deletions fs/f2fs/data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,10 @@ static bool f2fs_bio_post_read_required(struct bio *bio, int err)

static void f2fs_read_end_io(struct bio *bio, int err)
{
#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);
err = -EIO;
}
#endif

if (f2fs_bio_post_read_required(bio, err)) {
struct bio_post_read_ctx *ctx = bio->bi_private;
Expand Down
3 changes: 1 addition & 2 deletions fs/f2fs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
50 changes: 25 additions & 25 deletions fs/f2fs/f2fs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
} while (0)
#endif

#ifdef CONFIG_F2FS_FAULT_INJECTION
enum {
FAULT_KMALLOC,
FAULT_KVMALLOC,
Expand All @@ -63,6 +62,7 @@ enum {
FAULT_MAX,
};

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

struct f2fs_fault_info {
Expand Down Expand Up @@ -1418,6 +1418,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,
Expand Down Expand Up @@ -1770,13 +1776,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.
Expand Down Expand Up @@ -1985,12 +1990,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);

Expand Down Expand Up @@ -2075,22 +2078,23 @@ 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 (!for_write)
page = find_get_page_flags(mapping, index,
FGP_LOCK | FGP_ACCESSED);
else
page = find_lock_page(mapping, index);
if (page)
return page;
if (IS_ENABLED(CONFIG_F2FS_FAULT_INJECTION)) {
if (!for_write)
page = find_get_page_flags(mapping, index,
FGP_LOCK | FGP_ACCESSED);
else
page = find_lock_page(mapping, index);
if (page)
return page;

if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_ALLOC)) {
f2fs_show_injection_info(FAULT_PAGE_ALLOC);
return NULL;
if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_ALLOC)) {
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);
Expand All @@ -2100,12 +2104,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);
}

Expand Down Expand Up @@ -2170,12 +2173,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);
}

Expand Down Expand Up @@ -2710,12 +2712,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);
}

Expand Down Expand Up @@ -2766,12 +2767,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);
}

Expand Down
3 changes: 1 addition & 2 deletions fs/f2fs/file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,12 +669,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);
Expand Down
2 changes: 0 additions & 2 deletions fs/f2fs/gc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,10 @@ static int gc_thread_func(void *data)
continue;
}

#ifdef CONFIG_F2FS_FAULT_INJECTION
if (time_to_inject(sbi, FAULT_CHECKPOINT)) {
f2fs_show_injection_info(FAULT_CHECKPOINT);
f2fs_stop_checkpoint(sbi, false);
}
#endif

if (!sb_start_write_trylock(sbi->sb))
continue;
Expand Down
3 changes: 1 addition & 2 deletions fs/f2fs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,12 +659,11 @@ void f2fs_evict_inode(struct inode *inode)
if (F2FS_HAS_BLOCKS(inode))
err = f2fs_truncate(inode);

#ifdef CONFIG_F2FS_FAULT_INJECTION
if (time_to_inject(sbi, FAULT_EVICT_INODE)) {
f2fs_show_injection_info(FAULT_EVICT_INODE);
err = -EIO;
}
#endif

if (!err) {
f2fs_lock_op(sbi);
err = f2fs_remove_inode_page(inode);
Expand Down
3 changes: 1 addition & 2 deletions fs/f2fs/node.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2327,12 +2327,11 @@ bool f2fs_alloc_nid(struct f2fs_sb_info *sbi, nid_t *nid)
struct f2fs_nm_info *nm_i = NM_I(sbi);
struct free_nid *i = NULL;
retry:
#ifdef CONFIG_F2FS_FAULT_INJECTION
if (time_to_inject(sbi, FAULT_ALLOC_NID)) {
f2fs_show_injection_info(FAULT_ALLOC_NID);
return false;
}
#endif

spin_lock(&nm_i->nid_list_lock);

if (unlikely(nm_i->available_nids == 0)) {
Expand Down
5 changes: 2 additions & 3 deletions fs/f2fs/recovery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,10 +506,9 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,

if (src == NULL_ADDR) {
err = f2fs_reserve_new_block(&dn);
#ifdef CONFIG_F2FS_FAULT_INJECTION
while (err)
while (err &&
IS_ENABLED(CONFIG_F2FS_FAULT_INJECTION))
err = f2fs_reserve_new_block(&dn);
#endif
/* We should not get -ENOSPC */
f2fs_bug_on(sbi, err);
if (err)
Expand Down
4 changes: 0 additions & 4 deletions fs/f2fs/segment.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,12 +470,10 @@ int f2fs_commit_inmem_pages(struct inode *inode)
*/
void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)
{
#ifdef CONFIG_F2FS_FAULT_INJECTION
if (time_to_inject(sbi, FAULT_CHECKPOINT)) {
f2fs_show_injection_info(FAULT_CHECKPOINT);
f2fs_stop_checkpoint(sbi, false);
}
#endif

/* balance_fs_bg is able to be pending */
if (need && excess_cached_nats(sbi))
Expand Down Expand Up @@ -1123,13 +1121,11 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,

dc->len += len;

#ifdef CONFIG_F2FS_FAULT_INJECTION
if (time_to_inject(sbi, FAULT_DISCARD)) {
f2fs_show_injection_info(FAULT_DISCARD);
err = -EIO;
goto submit;
}
#endif
err = __blkdev_issue_discard(bdev,
SECTOR_FROM_BLOCK(start),
SECTOR_FROM_BLOCK(len),
Expand Down

0 comments on commit 275c76d

Please sign in to comment.