f2fs: rework fault injection handling to avoid a warning
PATCH 1/1 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.
--- fs/f2fs/checkpoint.c | 3 +-- fs/f2fs/data.c | 2 -- fs/f2fs/dir.c | 3 +-- fs/f2fs/f2fs.h | 50 ++++++++++++++++++++++---------------------- fs/f2fs/file.c | 3 +-- fs/f2fs/gc.c | 2 -- fs/f2fs/inode.c | 3 +-- fs/f2fs/node.c | 3 +-- fs/f2fs/recovery.c | 5 ++--- fs/f2fs/segment.c | 4 ---- 10 files changed, 32 insertions(+), 46 deletions(-)
fs/f2fs/checkpoint.c +1 -2
@@ -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
@@ -126,12 +126,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_first_page_all (bio)),FAULT_IO )) {f2fs_show_injection_info (FAULT_IO ); bio->bi_status =BLK_STS_IOERR ; } -#endif if (f2fs_bio_post_read_required (bio)) {struct bio_post_read_ctx *ctx = bio->bi_private;
fs/f2fs/dir.c +1 -2
@@ -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
139 lines not on this page · raw message
fs/f2fs/file.c +1 -2
@@ -668,12 +668,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);
fs/f2fs/gc.c +0 -2
@@ -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 ;
fs/f2fs/inode.c +1 -2
@@ -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);
fs/f2fs/node.c +1 -2
@@ -2321,12 +2321,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 )) {
fs/f2fs/recovery.c +2 -3
@@ -518,10 +518,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)
fs/f2fs/segment.c +0 -4
@@ -474,12 +474,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))
@@ -1045,13 +1043,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),
Signature · 6 lines
2.18.0 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Quoted 10 lines · Arnd Bergmann
When
CONFIG_F2FS_FAULT_INJECTIONis 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.
Quoted 5 lines
By defining
time_to_inject()as a trivial stub, most of the checks forCONFIG_F2FS_FAULT_INJECTIONcan go away. This also leads to nicer formatting of the code.Signed-off-by Arnd Bergmann <[email protected]>
Thanks,