anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FROMGIT: f2fs: remove gc_urgent_high_limited for cleanup

Browse Source 
Remove redundant sbi->gc_urgent_high_limited.

Signed-off-by: Chao Yu <chao.yu@oppo.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 265576181b4afda8c60ae85261f55a8430419884
     https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev)
Change-Id: Id92efe0343922c0b0fc279332ec102f1d8de8ecc
This commit is contained in:
Chao Yu
2022-08-20 11:06:00 +08:00
committed by Todd Kjos
parent e4c3ce6f7d
commit b52dcd4e22
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/f2fs/f2fs.h
View File

@@ -1727,7 +1727,6 @@ struct f2fs_sb_info {
unsigned int gc_mode; /* current GC state */
unsigned int next_victim_seg[2]; /* next segment in victim section */
spinlock_t gc_urgent_high_lock;
bool gc_urgent_high_limited; /* indicates having limited trial count */
unsigned int gc_urgent_high_remaining; /* remaining trial count for GC_URGENT_HIGH */
/* for skip statistic */

8
fs/f2fs/gc.c
View File

@@ -93,10 +93,10 @@ static int gc_thread_func(void *data)
*/
if (sbi->gc_mode == GC_URGENT_HIGH) {
spin_lock(&sbi->gc_urgent_high_lock);
if (sbi->gc_urgent_high_limited &&
!sbi->gc_urgent_high_remaining--) {
sbi->gc_urgent_high_limited = false;
sbi->gc_mode = GC_NORMAL;
if (sbi->gc_urgent_high_remaining) {
sbi->gc_urgent_high_remaining--;
if (!sbi->gc_urgent_high_remaining)
sbi->gc_mode = GC_NORMAL;
}
spin_unlock(&sbi->gc_urgent_high_lock);
}

1
fs/f2fs/sysfs.c
View File

@@ -513,7 +513,6 @@ out:
if (!strcmp(a->attr.name, "gc_urgent_high_remaining")) {
spin_lock(&sbi->gc_urgent_high_lock);
sbi->gc_urgent_high_limited = t != 0;
sbi->gc_urgent_high_remaining = t;
spin_unlock(&sbi->gc_urgent_high_lock);