f2fs: issue discard commands if gc_urgent is set

It's time to issue all the discard commands, if user sets the idle time.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 1387925a0d83b142d7d8a6bd35127dc9fc9079e2..e3922f902c8c4128a6877a5b25fb616bb4cad04d 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -21,6 +21,7 @@
 #include "f2fs.h"
 #include "segment.h"
 #include "node.h"
+#include "gc.h"
 #include "trace.h"
 #include <trace/events/f2fs.h>
 
@@ -1194,8 +1195,11 @@ static int issue_discard_thread(void *data)
                if (kthread_should_stop())
                        return 0;
 
-               if (dcc->discard_wake)
+               if (dcc->discard_wake) {
                        dcc->discard_wake = 0;
+                       if (sbi->gc_thread && sbi->gc_thread->gc_urgent)
+                               mark_discard_range_all(sbi);
+               }
 
                sb_start_intwrite(sbi->sb);
 

diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 4bcaa90590267edbc6e472d5d17f430e2cbd4945..b9ad9041559f8b9d3145a3ed165a34d77d8c5ac4 100644 (file)
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -178,8 +178,13 @@ 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);
        }
 
        return count;