From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757164AbaGWCgt (ORCPT ); Tue, 22 Jul 2014 22:36:49 -0400 Received: from mga02.intel.com ([134.134.136.20]:44642 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755632AbaGWCgr (ORCPT ); Tue, 22 Jul 2014 22:36:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,714,1400050800"; d="scan'208";a="577336368" From: "Chen, Gong" To: linux-kernel@vger.kernel.org Cc: mingo@kernel.org, tglx@linutronix.de, paulus@samba.org, benh@kernel.crashing.org, tony.luck@intel.com, hpa@zytor.com, jkosina@suse.cz, rafael.j.wysocki@intel.com, bp@alien8.de, linux@arm.linux.org.uk, ralf@linux-mips.org, schwidefsky@de.ibm.com, davem@davemloft.net, viro@zeniv.linux.org.uk, fweisbec@gmail.com, cl@linux.com, akpm@linux-foundation.org, axboe@kernel.dk, JBottomley@parallels.com, neilb@suse.de, christoffer.dall@linaro.org, rostedt@goodmis.org, rric@kernel.org, gregkh@linuxfoundation.org, mhocko@suse.cz, david@fromorbit.com, "Chen, Gong" Subject: [RFC PATCH v1 46/70] block, blk-mq: _FROZEN Cleanup Date: Tue, 22 Jul 2014 21:59:22 -0400 Message-Id: <1406080786-3938-47-git-send-email-gong.chen@linux.intel.com> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1406080786-3938-1-git-send-email-gong.chen@linux.intel.com> References: <1406080786-3938-1-git-send-email-gong.chen@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove XXX_FROZEN state from block/blk-mq. Signed-off-by: Chen, Gong --- 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