MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-13 12:49:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

f2fs: compress: fix error path of inc_valid_block_count()

Browse Source 
If inc_valid_block_count() can not allocate all requested blocks,
it needs to release block count in .total_valid_block_count and
resevation blocks in inode.

Fixes: 5460749487 ("f2fs: compress: fix to avoid inconsistence bewteen i_blocks and dnode")
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2024-05-06 18:41:37 +08:00 committed by Jaegeuk Kim
parent a3a0bc6c22
commit 043c832371
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/f2fs/f2fs.h
View File

@ -2306,7 +2306,7 @@ static inline void f2fs_i_blocks_write(struct inode *, block_t, bool, bool);
static inline int inc_valid_block_count(struct f2fs_sb_info *sbi, static inline int inc_valid_block_count(struct f2fs_sb_info *sbi,
struct inode *inode, blkcnt_t *count, bool partial) struct inode *inode, blkcnt_t *count, bool partial)
{ {
blkcnt_t diff = 0, release = 0; long long diff = 0, release = 0;
block_t avail_user_block_count; block_t avail_user_block_count;
int ret; int ret;
@ -2326,26 +2326,27 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi,
percpu_counter_add(&sbi->alloc_valid_block_count, (*count)); percpu_counter_add(&sbi->alloc_valid_block_count, (*count));
spin_lock(&sbi->stat_lock); spin_lock(&sbi->stat_lock);
sbi->total_valid_block_count += (block_t)(*count);
avail_user_block_count = get_available_block_count(sbi, inode, true);
if (unlikely(sbi->total_valid_block_count > avail_user_block_count)) { avail_user_block_count = get_available_block_count(sbi, inode, true);
diff = (long long)sbi->total_valid_block_count + *count -
avail_user_block_count;
if (unlikely(diff > 0)) {
if (!partial) { if (!partial) {
spin_unlock(&sbi->stat_lock); spin_unlock(&sbi->stat_lock);
release = *count;
goto enospc; goto enospc;
} }
diff = sbi->total_valid_block_count - avail_user_block_count;
if (diff > *count) if (diff > *count)
diff = *count; diff = *count;
*count -= diff; *count -= diff;
release = diff; release = diff;
sbi->total_valid_block_count -= diff;
if (!*count) { if (!*count) {
spin_unlock(&sbi->stat_lock); spin_unlock(&sbi->stat_lock);
goto enospc; goto enospc;
} }
} }
sbi->total_valid_block_count += (block_t)(*count);
spin_unlock(&sbi->stat_lock); spin_unlock(&sbi->stat_lock);
if (unlikely(release)) { if (unlikely(release)) {