From e3fabdfdf70e2b340cff968fd1d13e4c624de926 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 31 Aug 2016 15:16:22 -0700 Subject: [PATCH] dm: use signal_pending_state() in dm_wait_for_completion() Use signal_pending_state() instead of open-coding it. This patch does not change any functionality but makes it possible to pass TASK_KILLABLE as the second argument of dm_wait_for_completion(). See also commit 16882c1e962b ("sched: fix TASK_WAKEKILL vs SIGKILL race"). Signed-off-by: Bart Van Assche . Signed-off-by: Mike Snitzer --- drivers/md/dm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 4aaffe05de94..6678cb2c2138 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1954,8 +1954,7 @@ static int dm_wait_for_completion(struct mapped_device *md, long task_state) if (!md_in_flight(md)) break; - if (task_state == TASK_INTERRUPTIBLE && - signal_pending(current)) { + if (signal_pending_state(task_state, current)) { r = -EINTR; break; } -- GitLab