From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752050AbaBZLCr (ORCPT ); Wed, 26 Feb 2014 06:02:47 -0500 Received: from moutng.kundenserver.de ([212.227.126.130]:62063 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751489AbaBZLCp (ORCPT ); Wed, 26 Feb 2014 06:02:45 -0500 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , "David S. Miller" , linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org Subject: [PATCH 10/16] atm: nicstar: remove interruptible_sleep_on_timeout Date: Wed, 26 Feb 2014 12:01:50 +0100 Message-Id: <1393412516-3762435-11-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393412516-3762435-1-git-send-email-arnd@arndb.de> References: <1393412516-3762435-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:2azLJbA7yvYG0xxb5S/IzMJL7MQdThXmDfkH6kYOW7s /Sw1ryVfdKSRW9YXA3KyXBzjTZccpVTNJPQDN/P0JgYMXtbezj xoZL9Hs/xNp3A+PlJUW/hplt1GDBVcWohLKA/SLjRx1XAf2afa YLDZaQ86HnkhErH037yAbUudDQZCx3VRkM+OHL0bIWaGGoVg5z wMjkjk1SCRi4/O5jLKKHabFO26X3DUf3MsivsGnqQneJGBj0iO F1lLPJbZ/xui9EYkfSN+a3OpHXjVQ41WHsIwpWAQpclYZjhj02 Uj2fhoeyW/gHNfcdrhIRPraoNn16XwucGoTT7Hj1otk2bDReKY 1Iv6u55roSoJ+H8GJJcUATEtnM1Mn1ZzJr1006GhV Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We are trying to finally kill off interruptible_sleep_on_timeout. the two uses in the nicstar driver can be trivially replaced with wait_event_interruptible_lock_irq_timeout, which prevents the wake-up race and is able to check the buffer state with scq->lock held. Signed-off-by: Arnd Bergmann Acked-by: Chas Williams Cc: David S. Miller Cc: linux-atm-general@lists.sourceforge.net Cc: netdev@vger.kernel.org --- drivers/atm/nicstar.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index 9587e95..e1b17d57 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -1739,10 +1739,9 @@ static int push_scqe(ns_dev * card, vc_map * vc, scq_info * scq, ns_scqe * tbd, } scq->full = 1; - spin_unlock_irqrestore(&scq->lock, flags); - interruptible_sleep_on_timeout(&scq->scqfull_waitq, - SCQFULL_TIMEOUT); - spin_lock_irqsave(&scq->lock, flags); + wait_event_interruptible_lock_irq_timeout(scq->scqfull_waitq, + scq->tail != scq->next, scq->lock, + SCQFULL_TIMEOUT); if (scq->full) { spin_unlock_irqrestore(&scq->lock, flags); @@ -1789,10 +1788,10 @@ static int push_scqe(ns_dev * card, vc_map * vc, scq_info * scq, ns_scqe * tbd, scq->full = 1; if (has_run++) break; - spin_unlock_irqrestore(&scq->lock, flags); - interruptible_sleep_on_timeout(&scq->scqfull_waitq, + wait_event_interruptible_lock_irq_timeout(scq->scqfull_waitq, + scq->tail != scq->next, + scq->lock, SCQFULL_TIMEOUT); - spin_lock_irqsave(&scq->lock, flags); } if (!scq->full) { -- 1.8.3.2