f2fs: merge f2fs_show_injection_info() into time_to_inject()
PATCH v3 1/1 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.
--- fs/f2fs/checkpoint.c | 5 +---- fs/f2fs/data.c | 8 ++------ fs/f2fs/dir.c | 4 +--- fs/f2fs/f2fs.h | 44 ++++++++++++++------------------------------ fs/f2fs/file.c | 4 +--- fs/f2fs/gc.c | 4 +--- fs/f2fs/inode.c | 4 +--- fs/f2fs/node.c | 4 +--- fs/f2fs/segment.c | 5 +---- fs/f2fs/super.c | 8 ++------ 10 files changed, 25 insertions(+), 65 deletions(-)
fs/f2fs/checkpoint.c +1 -4
@@ -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
@@ -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
@@ -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
116 lines not on this page · raw message
fs/f2fs/file.c +1 -3
@@ -784,10 +784,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)
fs/f2fs/gc.c +1 -3
@@ -72,11 +72,9 @@ static int gc_thread_func(void *data)continue ; } -if (time_to_inject (sbi,FAULT_CHECKPOINT )) { -f2fs_show_injection_info (sbi,FAULT_CHECKPOINT ); +if (time_to_inject (sbi,FAULT_CHECKPOINT ))f2fs_stop_checkpoint (sbi, false,STOP_CP_REASON_FAULT_INJECT ); - }if (!sb_start_write_trylock (sbi->sb)) {stat_other_skip_bggc_count (sbi);
fs/f2fs/inode.c +1 -3
@@ -809,10 +809,8 @@ void f2fs_evict_inode(struct inode *inode)if (F2FS_HAS_BLOCKS (inode)) err =f2fs_truncate (inode); -if (time_to_inject (sbi,FAULT_EVICT_INODE )) { -f2fs_show_injection_info (sbi,FAULT_EVICT_INODE ); +if (time_to_inject (sbi,FAULT_EVICT_INODE )) err = -EIO ; - }if (!err) {f2fs_lock_op (sbi);
fs/f2fs/node.c +1 -3
@@ -2544,10 +2544,8 @@ 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: -if (time_to_inject (sbi,FAULT_ALLOC_NID )) { -f2fs_show_injection_info (sbi,FAULT_ALLOC_NID ); +if (time_to_inject (sbi,FAULT_ALLOC_NID ))return false; - }spin_lock (&nm_i->nid_list_lock);
fs/f2fs/segment.c +1 -4
@@ -384,10 +384,8 @@ int f2fs_commit_atomic_write(struct inode *inode)*/ void f2fs_balance_fs (struct f2fs_sb_info *sbi,bool need) { -if (time_to_inject (sbi,FAULT_CHECKPOINT )) { -f2fs_show_injection_info (sbi,FAULT_CHECKPOINT ); +if (time_to_inject (sbi,FAULT_CHECKPOINT ))f2fs_stop_checkpoint (sbi, false,STOP_CP_REASON_FAULT_INJECT ); - }/* balance_fs_bg is able to be pending */ if (need &&excess_cached_nats (sbi))
@@ -1142,7 +1140,6 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, dc->len += len;if (time_to_inject (sbi,FAULT_DISCARD )) { -f2fs_show_injection_info (sbi,FAULT_DISCARD ); err = -EIO ; }else { err = __blkdev_issue_discard(bdev,
fs/f2fs/super.c +2 -6
@@ -1372,10 +1372,8 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb) {struct f2fs_inode_info *fi; -if (time_to_inject (F2FS_SB (sb),FAULT_SLAB_ALLOC )) { -f2fs_show_injection_info (F2FS_SB (sb),FAULT_SLAB_ALLOC ); +if (time_to_inject (F2FS_SB (sb),FAULT_SLAB_ALLOC ))return NULL ; - } fi =alloc_inode_sb (sb, f2fs_inode_cachep,GFP_F2FS_ZERO );if (!fi)
@@ -2595,10 +2593,8 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type,int f2fs_dquot_initialize (struct inode *inode) { -if (time_to_inject (F2FS_I_SB (inode),FAULT_DQUOT_INIT )) { -f2fs_show_injection_info (F2FS_I_SB (inode),FAULT_DQUOT_INIT ); +if (time_to_inject (F2FS_I_SB (inode),FAULT_DQUOT_INIT ))return -ESRCH ; - }return dquot_initialize (inode); }
Signature · 1 line
2.25.1
Quoted 10 lines · Yangtao Li
There is no need to additionally use
f2fs_show_injection_info()to output information. Concatenatetime_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 Chao Yu <[email protected]>Signed-off-by Yangtao Li <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 9 lines · On Wed, 21 Dec 2022 02:39:04 +0800 you wrote:
There is no need to additionally use
f2fs_show_injection_info()to output information. Concatenatetime_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.[...]
Here is the summary with links:
- [f2fs-dev,v3] f2fs: merge f2fs_show_injection_info() into time_to_inject()
https://git.kernel.org/jaegeuk/f2fs/c/c40e15a9a59f
You are awesome, thank you!
Signature · 10 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel