f2fs: Keep alloc_valid_block_count in sync
PATCH 1/1 f2fs: Keep alloc_valid_block_count in sync
If we attempt to request more blocks than we have room for, we try to instead request as much as we can, however, alloc_valid_block_count is not decremented to match the new value, allowing it to drift higher until the next checkpoint. This always decrements it when the requested amount cannot be fulfilled.
--- fs/f2fs/f2fs.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/f2fs/f2fs.h +4 -2
@@ -1680,18 +1680,20 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi, sbi->total_valid_block_count -= diff;if (!*count) {spin_unlock (&sbi->stat_lock); -percpu_counter_sub (&sbi->alloc_valid_block_count, diff); goto enospc; } }spin_unlock (&sbi->stat_lock); -if (unlikely (release)) +if (unlikely (release)) { +percpu_counter_sub (&sbi->alloc_valid_block_count, release);dquot_release_reservation_block (inode, release); + }f2fs_i_blocks_write (inode, *count, true, true);return 0 ; enospc: +percpu_counter_sub (&sbi->alloc_valid_block_count, release);dquot_release_reservation_block (inode, release);return -ENOSPC ; }
Signature · 6 lines
2.18.0.203.gfac676dfb9-goog ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Quoted 7 lines · Daniel Rosenberg
If we attempt to request more blocks than we have room for, we try to instead request as much as we can, however,
alloc_valid_block_countis not decremented to match the new value, allowing it to drift higher until the next checkpoint. This always decrements it when the requested amount cannot be fulfilled.Signed-off-by Daniel Rosenberg <[email protected]>
Good catch, thanks for the fixing. :)
Thanks,
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot