OSDN Git Service

f2fs: fix wrong error injection path in inc_valid_block_count()
authorChao Yu <yuchao0@huawei.com>
Fri, 23 Aug 2019 09:58:34 +0000 (17:58 +0800)
committer0ranko0P <ranko0p@outlook.com>
Tue, 24 Dec 2019 20:42:25 +0000 (04:42 +0800)
If FAULT_BLOCK type error injection is on, in inc_valid_block_count()
we may decrease sbi->alloc_valid_block_count percpu stat count
incorrectly, fix it.

Fixes: 36b877af7992 ("f2fs: Keep alloc_valid_block_count in sync")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/f2fs.h

index 8f53173..da22aa1 100644 (file)
@@ -1829,7 +1829,7 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi,
        if (time_to_inject(sbi, FAULT_BLOCK)) {
                f2fs_show_injection_info(FAULT_BLOCK);
                release = *count;
-               goto enospc;
+               goto release_quota;
        }
 
        /*
@@ -1874,6 +1874,7 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi,
 
 enospc:
        percpu_counter_sub(&sbi->alloc_valid_block_count, release);
+release_quota:
        dquot_release_reservation_block(inode, release);
        return -ENOSPC;
 }