diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2017-10-18 19:01:11 -0400 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2017-11-01 21:32:21 -0700 |
| commit | ae89fd3de4793c0dc2ec7e9f26b58a357d74a6c7 (patch) | |
| tree | ff01b76ce4885259ff750e5977bf62eb5f880e59 | |
| parent | b03e0ccb5ab9df3efbe51c87843a1ffbecbafa1f (diff) | |
| download | op-kernel-dev-ae89fd3de4793c0dc2ec7e9f26b58a357d74a6c7.zip op-kernel-dev-ae89fd3de4793c0dc2ec7e9f26b58a357d74a6c7.tar.gz | |
md: use TASK_IDLE instead of blocking signals
Hi - I submit this patch for the next merge window:
Some times ago, I made a patch f9c79bc05a2a that blocks signals around the
schedule() calls in MD. The MD subsystem needs to do an uninterruptible
sleep that is not accounted in load average - so we block signals and use
interruptible sleep.
The kernel has a special TASK_IDLE state for this purpose, so we can use
it instead of blocking signals. This patch doesn't fix any bug, it just
makes the code simpler.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Acked-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
| -rw-r--r-- | drivers/md/raid1.c | 7 | ||||
| -rw-r--r-- | drivers/md/raid5.c | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 9428dfa..1f36473 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -37,7 +37,6 @@ #include <linux/module.h> #include <linux/seq_file.h> #include <linux/ratelimit.h> -#include <linux/sched/signal.h> #include <trace/events/block.h> @@ -1320,18 +1319,14 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, */ DEFINE_WAIT(w); for (;;) { - sigset_t full, old; prepare_to_wait(&conf->wait_barrier, - &w, TASK_INTERRUPTIBLE); + &w, TASK_IDLE); if (!mddev_is_clustered(mddev) || !md_cluster_ops->area_resyncing(mddev, WRITE, bio->bi_iter.bi_sector, bio_end_sector(bio))) break; - sigfillset(&full); - sigprocmask(SIG_BLOCK, &full, &old); schedule(); - sigprocmask(SIG_SETMASK, &old, NULL); } finish_wait(&conf->wait_barrier, &w); } diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 17ffa1e..2a4b349 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -55,7 +55,6 @@ #include <linux/ratelimit.h> #include <linux/nodemask.h> #include <linux/flex_array.h> -#include <linux/sched/signal.h> #include <trace/events/block.h> #include <linux/list_sort.h> |
