redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

f2fs: shrink critical region in spin_lock 

This patch shrinks the critical region in spin_lock.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
hifive-unleashed-5.1
Jaegeuk Kim 2016-06-30 19:02:06 -07:00
parent 237c0790e5
commit 2555a2d558
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/f2fs/f2fs.h
View File

@ -1136,30 +1136,23 @@ static inline void f2fs_i_blocks_write(struct inode *, blkcnt_t, bool);
static inline bool inc_valid_block_count(struct f2fs_sb_info *sbi, static inline bool inc_valid_block_count(struct f2fs_sb_info *sbi,
struct inode *inode, blkcnt_t *count) struct inode *inode, blkcnt_t *count)
{ {
block_t valid_block_count;
spin_lock(&sbi->stat_lock);
#ifdef CONFIG_F2FS_FAULT_INJECTION #ifdef CONFIG_F2FS_FAULT_INJECTION
if (time_to_inject(FAULT_BLOCK)) { if (time_to_inject(FAULT_BLOCK))
spin_unlock(&sbi->stat_lock);
return false; return false;
}
#endif #endif
valid_block_count = spin_lock(&sbi->stat_lock);
sbi->total_valid_block_count + (block_t)(*count); sbi->total_valid_block_count += (block_t)(*count);
if (unlikely(valid_block_count > sbi->user_block_count)) { if (unlikely(sbi->total_valid_block_count > sbi->user_block_count)) {
*count = sbi->user_block_count - sbi->total_valid_block_count; *count -= sbi->total_valid_block_count - sbi->user_block_count;
sbi->total_valid_block_count = sbi->user_block_count;
if (!*count) { if (!*count) {
spin_unlock(&sbi->stat_lock); spin_unlock(&sbi->stat_lock);
return false; return false;
} }
} }
/* *count can be recalculated */
f2fs_i_blocks_write(inode, *count, true);
sbi->total_valid_block_count =
sbi->total_valid_block_count + (block_t)(*count);
spin_unlock(&sbi->stat_lock); spin_unlock(&sbi->stat_lock);
f2fs_i_blocks_write(inode, *count, true);
percpu_counter_add(&sbi->alloc_valid_block_count, (*count)); percpu_counter_add(&sbi->alloc_valid_block_count, (*count));
return true; return true;
} }
@ -1171,9 +1164,9 @@ static inline void dec_valid_block_count(struct f2fs_sb_info *sbi,
spin_lock(&sbi->stat_lock); spin_lock(&sbi->stat_lock);
f2fs_bug_on(sbi, sbi->total_valid_block_count < (block_t) count); f2fs_bug_on(sbi, sbi->total_valid_block_count < (block_t) count);
f2fs_bug_on(sbi, inode->i_blocks < count); f2fs_bug_on(sbi, inode->i_blocks < count);
f2fs_i_blocks_write(inode, count, false);
sbi->total_valid_block_count -= (block_t)count; sbi->total_valid_block_count -= (block_t)count;
spin_unlock(&sbi->stat_lock); spin_unlock(&sbi->stat_lock);
f2fs_i_blocks_write(inode, count, false);
} }
static inline void inc_page_count(struct f2fs_sb_info *sbi, int count_type) static inline void inc_page_count(struct f2fs_sb_info *sbi, int count_type)