]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jan 2020 13:51:11 +0000 (14:51 +0100)
[ Upstream commit 9ea2f0be6ceaebae1518a5f897cff2645830dd95 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/f2fs/f2fs.h

index 72d154e71bb565204cb7a4eb850124313e01117e..6b5b685af599044040423cf0184832985499ba59 100644 (file)
@@ -1701,7 +1701,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;
        }
 
        /*
@@ -1741,6 +1741,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;
 }