From patchwork Sun May 26 15:53:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 2616641 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2C632DFB79 for ; Sun, 26 May 2013 16:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754157Ab3EZP5e (ORCPT ); Sun, 26 May 2013 11:57:34 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:46125 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754086Ab3EZP52 (ORCPT ); Sun, 26 May 2013 11:57:28 -0400 Received: by mail-pa0-f54.google.com with SMTP id kx1so6030503pab.13 for ; Sun, 26 May 2013 08:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=h4iYbzjYxjTSi60gXd+9ZKE1bQlillPZDnAYMVVt/Ec=; b=V6a4q/diNn0k8eXPalrdE9VMQ2nvqGeBj+t+8TaOSZmSlp6b/EmMo/2w/y1mHsVf5u m77XBiTvbFoWcRPCqbHdbMLXYpvdz89ElnBUHeOtzX4MtKBiFNnCfSYdfb5vmvAg1MRb t/5bwl66Pp/I2w9Y5ZR+qioIaxqV55NBTTJjlxnusUT/DTHE+bGL4yLTzua3qyyLukSa yxP7ttvqdw38yZv5M8BQ7a/TvX2MOqTgAig4FCpEtyEjJvq3HHy4+TS2yfP4ZSsj2/le KdSN6+fkob3QCJTDLZxlm7VnDNddTpvJqTE3sujsrge6NcQRuvO47vB3zFmmia7dJ9eD /SAg== X-Received: by 10.66.224.73 with SMTP id ra9mr26209599pac.163.1369583847672; Sun, 26 May 2013 08:57:27 -0700 (PDT) Received: from localhost.localdomain ([111.196.197.202]) by mx.google.com with ESMTPSA id ze11sm26603189pab.22.2013.05.26.08.57.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 May 2013 08:57:26 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Yinghai Lu Cc: Jiang Liu , "Rafael J . Wysocki" , Greg Kroah-Hartman , Gu Zheng , Toshi Kani , Myron Stowe , Yijing Wang , Jiang Liu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3, part2 04/20] PCI, IOV: hold a reference to PCI bus when creating virtual PCI devices Date: Sun, 26 May 2013 23:53:01 +0800 Message-Id: <1369583597-3801-5-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> References: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Also use new iterator to walk PCI devices of a PCI bus. Signed-off-by: Jiang Liu --- drivers/pci/iov.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 5eb8165..4b796d6 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -36,19 +36,17 @@ static struct pci_bus *virtfn_add_bus(struct pci_bus *bus, int busnr) struct pci_bus *child; if (bus->number == busnr) - return bus; + return pci_bus_get(bus); - child = pci_find_bus(pci_domain_nr(bus), busnr); + child = pci_get_bus(pci_domain_nr(bus), busnr); if (child) return child; child = pci_add_new_bus(bus, NULL, busnr); - if (!child) - return NULL; - - pci_bus_insert_busn_res(child, busnr, busnr); + if (child) + pci_bus_insert_busn_res(child, busnr, busnr); - return child; + return pci_bus_get(child); } static void virtfn_remove_bus(struct pci_bus *physbus, struct pci_bus *virtbus) @@ -113,6 +111,7 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset) goto failed2; kobject_uevent(&virtfn->dev.kobj, KOBJ_CHANGE); + pci_bus_put(bus); return 0; @@ -125,6 +124,7 @@ failed1: virtfn_remove_bus(dev->bus, bus); failed0: mutex_unlock(&iov->dev->sriov->lock); + pci_bus_put(bus); return rc; }