From patchwork Thu Nov 30 14:20:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10084995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D21516035E for ; Thu, 30 Nov 2017 14:20:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD62B29831 for ; Thu, 30 Nov 2017 14:20:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B218829F17; Thu, 30 Nov 2017 14:20:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEA0529831 for ; Thu, 30 Nov 2017 14:20:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751111AbdK3OUl (ORCPT ); Thu, 30 Nov 2017 09:20:41 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:52021 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750923AbdK3OUk (ORCPT ); Thu, 30 Nov 2017 09:20:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=AWNG/akY7MyRjpTw7VZLXVe5nsHnS7sHuvWEgqq+8BY=; b=ui4ha4uVr9BuOfc9+oWlhGD5R pJKbHv5GP4hW17GXCzGHpgmvJEMqSTF8m8sjbVUCnScecp5Nd9wSjv8zkLBX8oQ5ZYKZIgrjwfH85 ZUKer27AXMPrAkOVyBbx8Bmody3bNj5l0lT5VhkZRR1H5QtbJMb3YLQVbPGMiQg0K2DWP0csw1FcZ QMpIqdW5Viq7BkyeXafBR3TR1CPpyS4MzhMBu4U+eFOJuKqWjzHmT2fiEv/L25kEQ0vgZkYbpIKq8 89VR7OeIkvI89Eig3PsJr1YiPdd3LZqHf8vYnNu9ep+fVG/t9vgAXHyUbGp1plJVno61hI/sBwt/q 74xujwxNw==; Received: from [209.244.105.251] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1eKPhe-0000bf-4p; Thu, 30 Nov 2017 14:20:38 +0000 From: Christoph Hellwig To: Ingo Molnar , eter Zijlstra Cc: Andrew Morton , Al Viro , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] epoll: use proper wake_up variant in ep_poll_callback Date: Thu, 30 Nov 2017 06:20:37 -0800 Message-Id: <20171130142037.19339-3-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171130142037.19339-1-hch@lst.de> References: <20171130142037.19339-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We do not hold ep->wq->lock, so we should not use wake_up_locked on it. Signed-off-by: Christoph Hellwig --- fs/eventpoll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index afd548ebc328..eaaa39616232 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1190,7 +1190,7 @@ static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v break; } } - wake_up_locked(&ep->wq); + wake_up(&ep->wq); } if (waitqueue_active(&ep->poll_wait)) pwake++;