Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933451AbbBCLXO (ORCPT ); Tue, 3 Feb 2015 06:23:14 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52564 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932264AbbBCLXL (ORCPT ); Tue, 3 Feb 2015 06:23:11 -0500 Date: Tue, 3 Feb 2015 03:22:07 -0800 From: tip-bot for Mikulas Patocka Message-ID: Cc: hpa@zytor.com, mpatocka@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org, tglx@linutronix.de Reply-To: mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, mpatocka@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/urgent] sched/wait: Remove might_sleep() from wait_event_cmd() Git-Commit-ID: 3e87523897e18a3e17fc8955ed795188be737ff1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1758 Lines: 46 Commit-ID: 3e87523897e18a3e17fc8955ed795188be737ff1 Gitweb: http://git.kernel.org/tip/3e87523897e18a3e17fc8955ed795188be737ff1 Author: Mikulas Patocka AuthorDate: Mon, 2 Feb 2015 09:39:02 -0500 Committer: Ingo Molnar CommitDate: Tue, 3 Feb 2015 12:14:25 +0100 sched/wait: Remove might_sleep() from wait_event_cmd() The patch e22b886a8a43 ("sched/wait: Add might_sleep() checks") introduced a bug in the raid5 subsystem. The function raid5_quiesce() (and resize_stripes()) uses the 'cmd' part to release and acquire a spinlock (so we call the sleep primitives in atomic context), and therefore we cannot do the might_sleep() check. Remove it. Fixes: e22b886a8a43 ("sched/wait: Add might_sleep() checks") Signed-off-by: Mikulas Patocka Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Link: http://lkml.kernel.org/r/alpine.LRH.2.02.1502020935580.13510@file01.intranet.prod.int.rdu2.redhat.com Signed-off-by: Ingo Molnar --- include/linux/wait.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/wait.h b/include/linux/wait.h index 2232ed1..37423e0 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -363,7 +363,6 @@ do { \ */ #define wait_event_cmd(wq, condition, cmd1, cmd2) \ do { \ - might_sleep(); \ if (condition) \ break; \ __wait_event_cmd(wq, condition, cmd1, cmd2); \ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/