summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2017-08-22 21:15:43 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2017-08-29 10:05:33 -0700
commit01983c715ad0e78842a885f361ad927a3a985994 (patch)
treedd8995b6626b9b423bcf2e7170f85d55879e65f7 /fs
parentadb6dc197187e2a5f5a7bed01e722f46a58676af (diff)
downloadop-kernel-dev-01983c715ad0e78842a885f361ad927a3a985994.zip
op-kernel-dev-01983c715ad0e78842a885f361ad927a3a985994.tar.gz
f2fs: wake up discard_thread iff there is a candidate
This patch fixes to avoid needless wake ups. Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/f2fs/segment.c3
-rw-r--r--fs/f2fs/segment.h25
-rw-r--r--fs/f2fs/sysfs.c6
3 files changed, 27 insertions, 7 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 8306bea..8375257 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1494,8 +1494,7 @@ skip:
kmem_cache_free(discard_entry_slab, entry);
}
- dcc->discard_wake = 1;
- wake_up_interruptible_all(&dcc->discard_wait_queue);
+ wake_up_discard_thread(sbi, false);
}
static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index b9b4f85..613b2fa 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -798,3 +798,28 @@ static inline long nr_pages_to_write(struct f2fs_sb_info *sbi, int type,
wbc->nr_to_write = desired;
return desired - nr_to_write;
}
+
+static inline void wake_up_discard_thread(struct f2fs_sb_info *sbi, bool force)
+{
+ struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+ bool wakeup = false;
+ int i;
+
+ if (force)
+ goto wake_up;
+
+ mutex_lock(&dcc->cmd_lock);
+ for (i = MAX_PLIST_NUM - 1;
+ i >= 0 && plist_issue(dcc->pend_list_tag[i]); i--) {
+ if (!list_empty(&dcc->pend_list[i])) {
+ wakeup = true;
+ break;
+ }
+ }
+ mutex_unlock(&dcc->cmd_lock);
+ if (!wakeup)
+ return;
+wake_up:
+ dcc->discard_wake = 1;
+ wake_up_interruptible_all(&dcc->discard_wait_queue);
+}
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index b9ad904..962735d 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -178,13 +178,9 @@ static ssize_t f2fs_sbi_store(struct f2fs_attr *a,
if (!strcmp(a->attr.name, "iostat_enable") && *ui == 0)
f2fs_reset_iostat(sbi);
if (!strcmp(a->attr.name, "gc_urgent") && t == 1 && sbi->gc_thread) {
- struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
-
sbi->gc_thread->gc_wake = 1;
wake_up_interruptible_all(&sbi->gc_thread->gc_wait_queue_head);
-
- dcc->discard_wake = 1;
- wake_up_interruptible_all(&dcc->discard_wait_queue);
+ wake_up_discard_thread(sbi, true);
}
return count;
OpenPOWER on IntegriCloud