From patchwork Sat Sep 18 23:44:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 65143 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 14F70B70D0 for ; Sun, 19 Sep 2010 09:44:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753918Ab0IRXob (ORCPT ); Sat, 18 Sep 2010 19:44:31 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:56359 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752995Ab0IRXoa (ORCPT ); Sat, 18 Sep 2010 19:44:30 -0400 Received: by pxi10 with SMTP id 10so872441pxi.19 for ; Sat, 18 Sep 2010 16:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=bRsD9jDdDTCTY93BaD7cqA4aDBTAMyx5FVRnYEnNx4Y=; b=dYgQHabwt4WUAvPtdhUjg+lRWNQ8jsPveRaOQ1LsJGWHOtcKajeDsaH/MTdjQNvK0i OEuHGuERsNPvUmzqhOwouKxpN3UKe9TI4/avMDB8P3259Cb8PuFyQN5GbS1jdK4iBF2y KV8WmTjvvIEPWaPA1w61ISF0Rmi5JH+Kzq5f8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=U3v1RxA91jwt3KqY9wCiH7MTZu1aKMkSAcmAlYNXQgK4sPWmzAd6rZzSbA8w/Y9Zpz fsto7irH0T3ZPRZ+1CdLzdPjcyRF0Vs8bvzC0dscRAV9V/P/16tuQ+UlH2uR6TZVd2IG 8rKnNRfCaQERSG5k+ntZ3RF6YMfU7p9TNBX6k= Received: by 10.114.25.5 with SMTP id 5mr7566987way.137.1284853470147; Sat, 18 Sep 2010 16:44:30 -0700 (PDT) Received: from bicker ([41.205.146.22]) by mx.google.com with ESMTPS id c24sm9844324wam.7.2010.09.18.16.44.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 18 Sep 2010 16:44:29 -0700 (PDT) Date: Sun, 19 Sep 2010 01:44:14 +0200 From: Dan Carpenter To: Andy Grover Cc: "David S. Miller" , Zach Brown , Chris Mason , rds-devel@oss.oracle.com, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch -next] rds: spin_lock_irq() is not nestable Message-ID: <20100918234414.GE6236@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is basically just a cleanup. IRQs were disabled on the previous line so we don't need to do it again here. In the current code IRQs would get turned on one line earlier than intended. Signed-off-by: Dan Carpenter --- Andy Grover acked part of this patch before but it didn't get pushed. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c index 8f6e221..b5a8841 100644 --- a/net/rds/ib_rdma.c +++ b/net/rds/ib_rdma.c @@ -171,9 +171,9 @@ void rds_ib_add_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *con BUG_ON(list_empty(&ic->ib_node)); list_del(&ic->ib_node); - spin_lock_irq(&rds_ibdev->spinlock); + spin_lock(&rds_ibdev->spinlock); list_add_tail(&ic->ib_node, &rds_ibdev->conn_list); - spin_unlock_irq(&rds_ibdev->spinlock); + spin_unlock(&rds_ibdev->spinlock); spin_unlock_irq(&ib_nodev_conns_lock); ic->rds_ibdev = rds_ibdev; diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c index 4e152e2..0e7accc 100644 --- a/net/rds/iw_rdma.c +++ b/net/rds/iw_rdma.c @@ -206,9 +206,9 @@ void rds_iw_add_conn(struct rds_iw_device *rds_iwdev, struct rds_connection *con BUG_ON(list_empty(&ic->iw_node)); list_del(&ic->iw_node); - spin_lock_irq(&rds_iwdev->spinlock); + spin_lock(&rds_iwdev->spinlock); list_add_tail(&ic->iw_node, &rds_iwdev->conn_list); - spin_unlock_irq(&rds_iwdev->spinlock); + spin_unlock(&rds_iwdev->spinlock); spin_unlock_irq(&iw_nodev_conns_lock); ic->rds_iwdev = rds_iwdev;