summaryrefslogtreecommitdiffstats
path: root/drivers/md/raid5-cache.c
diff options
context:
space:
mode:
authorShaohua Li <shli@fb.com>2016-11-21 19:29:18 +0100
committerShaohua Li <shli@fb.com>2016-11-24 04:30:06 +0100
commitce1ccd079fac0336191c0fd516ebf0e4985d59d4 (patch)
tree4d1f847d7fdfe2d0882e0e900c2b543b76bc5890 /drivers/md/raid5-cache.c
parentmd/raid10: add failfast handling for writes. (diff)
downloadlinux-ce1ccd079fac0336191c0fd516ebf0e4985d59d4.tar.xz
linux-ce1ccd079fac0336191c0fd516ebf0e4985d59d4.zip
raid5-cache: suspend reclaim thread instead of shutdown
There is mechanism to suspend a kernel thread. Use it instead of playing create/destroy game. Signed-off-by: Shaohua Li <shli@fb.com> Reviewed-by: NeilBrown <neilb@suse.de> Cc: Song Liu <songliubraving@fb.com>
Diffstat (limited to 'drivers/md/raid5-cache.c')
-rw-r--r--drivers/md/raid5-cache.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 8cb79fc0eed9..5f817bdaceb9 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -19,6 +19,7 @@
#include <linux/raid/md_p.h>
#include <linux/crc32c.h>
#include <linux/random.h>
+#include <linux/kthread.h>
#include "md.h"
#include "raid5.h"
#include "bitmap.h"
@@ -1437,23 +1438,14 @@ void r5l_quiesce(struct r5l_log *log, int state)
struct mddev *mddev;
if (!log || state == 2)
return;
- if (state == 0) {
- /*
- * This is a special case for hotadd. In suspend, the array has
- * no journal. In resume, journal is initialized as well as the
- * reclaim thread.
- */
- if (log->reclaim_thread)
- return;
- log->reclaim_thread = md_register_thread(r5l_reclaim_thread,
- log->rdev->mddev, "reclaim");
- log->reclaim_thread->timeout = R5C_RECLAIM_WAKEUP_INTERVAL;
- } else if (state == 1) {
+ if (state == 0)
+ kthread_unpark(log->reclaim_thread->tsk);
+ else if (state == 1) {
/* make sure r5l_write_super_and_discard_space exits */
mddev = log->rdev->mddev;
wake_up(&mddev->sb_wait);
+ kthread_park(log->reclaim_thread->tsk);
r5l_wake_reclaim(log, MaxSector);
- md_unregister_thread(&log->reclaim_thread);
r5l_do_reclaim(log);
}
}