Remove XXX_FROZEN state from block/blk-mq.
Signed-off-by: Chen, Gong <gong.c...@linux.intel.com>
---
block/blk-mq.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index ad69ef6..b5cd279 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1522,9 +1522,11 @@ static int blk_mq_hctx_notify(void *data, unsigned long
action,
{
struct blk_mq_hw_ctx *hctx = data;
- if (action == CPU_DEAD || action == CPU_DEAD_FROZEN)
+ action &= ~CPU_TASKS_FROZEN;
+
+ if (action == CPU_DEAD)
return blk_mq_hctx_cpu_offline(hctx, cpu);
- else if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN)
+ else if (action == CPU_ONLINE)
return blk_mq_hctx_cpu_online(hctx, cpu);
return NOTIFY_OK;
@@ -1939,8 +1941,8 @@ static int blk_mq_queue_reinit_notify(struct
notifier_block *nb,
* offline CPUs to first hardware queue. We will re-init the queue
* below to get optimal settings.
*/
- if (action != CPU_DEAD && action != CPU_DEAD_FROZEN &&
- action != CPU_ONLINE && action != CPU_ONLINE_FROZEN)
+ action &= ~CPU_TASKS_FROZEN;
+ if (action != CPU_DEAD && action != CPU_ONLINE)
return NOTIFY_OK;
mutex_lock(&all_q_mutex);
--
2.0.0.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
