linux-kernel - [RFC PATCH v1 46/70] block, blk-mq:

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1406080786-3938-47-git-send-email-gong.chen@linux.intel.com>
Date:	Tue, 22 Jul 2014 21:59:22 -0400
From:	"Chen, Gong" <gong.chen@...ux.intel.com>
To:	linux-kernel@...r.kernel.org
Cc:	mingo@...nel.org, tglx@...utronix.de, paulus@...ba.org,
	benh@...nel.crashing.org, tony.luck@...el.com, hpa@...or.com,
	jkosina@...e.cz, rafael.j.wysocki@...el.com, bp@...en8.de,
	linux@....linux.org.uk, ralf@...ux-mips.org,
	schwidefsky@...ibm.com, davem@...emloft.net,
	viro@...iv.linux.org.uk, fweisbec@...il.com, cl@...ux.com,
	akpm@...ux-foundation.org, axboe@...nel.dk,
	JBottomley@...allels.com, neilb@...e.de,
	christoffer.dall@...aro.org, rostedt@...dmis.org, rric@...nel.org,
	gregkh@...uxfoundation.org, mhocko@...e.cz, david@...morbit.com,
	"Chen, Gong" <gong.chen@...ux.intel.com>
Subject: [RFC PATCH v1 46/70] block, blk-mq: _FROZEN Cleanup

Remove XXX_FROZEN state from block/blk-mq.

Signed-off-by: Chen, Gong <gong.chen@...ux.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 majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/