From patchwork Thu Mar 2 12:54:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 9600177 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 15F8E60414 for ; Thu, 2 Mar 2017 12:56:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 055AC285B6 for ; Thu, 2 Mar 2017 12:56:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE0C4285B8; Thu, 2 Mar 2017 12:56:54 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 88FA9285B6 for ; Thu, 2 Mar 2017 12:56:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjQFz-0004ym-2D; Thu, 02 Mar 2017 12:54:55 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjQFy-0004yP-5E for xen-devel@lists.xenproject.org; Thu, 02 Mar 2017 12:54:54 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 97/6A-15112-D1618B85; Thu, 02 Mar 2017 12:54:53 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42JxWrrBXldabEe EwcHTnBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0bnwdnsBT95KvavbmRpYJzJ3cXIySEh4C9x 8NoHRhCbTUBHYurTS6wgtoiAncSlzQfYuxg5OJgFPCV6bpmDhIUFoiQOzNrABGKzCKhI/FzUA 2bzCrhLLDjSwAYxUk7i/PGfzCA2p4CHxJPekywgthBQzfb7M9khbBWJ9VNnsUH0CkqcnPkErI ZZQELi4IsXzBMYeWchSc1CklrAyLSKUaM4tagstUjX0EIvqSgzPaMkNzEzR9fQwEwvN7W4ODE 9NScxqVgvOT93EyMwdBiAYAfjzY0BhxglOZiURHnPi+yIEOJLyk+pzEgszogvKs1JLT7EKMPB oSTB+xQkJ1iUmp5akZaZAwximLQEB4+SCO8mkDRvcUFibnFmOkTqFKOilDjvR5CEAEgiozQPr g0WOZcYZaWEeRmBDhHiKUgtys0sQZV/xSjOwagkzPsJZApPZl4J3PRXQIuZgBa/UNkKsrgkES El1cDIudw5e8cHjbwji1r/eqT+cNsitD3eRb740ocujSrRO91J59d9ui9+Weln/K9sjg8Pa08 fz+F34/8kOXMWx0T2MJYjkQ1Om9lnbHrW1bbi69fk0m0bp9bktJR3qbIY3PnKZCX2Se9wzb5p 4g8t65P1jjiL+++PPKBTck7l54X+hDlGupcvCt1QYinOSDTUYi4qTgQA2iTY9ZcCAAA= X-Env-Sender: prvs=2277aaf80=Paul.Durrant@citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1488459289!89775233!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62492 invoked from network); 2 Mar 2017 12:54:50 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 2 Mar 2017 12:54:50 -0000 X-IronPort-AV: E=Sophos;i="5.35,231,1484006400"; d="scan'208";a="419738701" From: Paul Durrant To: , Date: Thu, 2 Mar 2017 12:54:25 +0000 Message-ID: <1488459266-29269-2-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1488459266-29269-1-git-send-email-paul.durrant@citrix.com> References: <1488459266-29269-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 Cc: Paul Durrant , Wei Liu Subject: [Xen-devel] [PATCH net 1/2] xen-netback: keep a local pointer for vif in backend_disconnect() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch replaces use of 'be->vif' with 'vif' and hence generally makes the function look tidier. No semantic change. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- Cc: Wei Liu --- drivers/net/xen-netback/xenbus.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index bb854f9..d82ddc9 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -492,24 +492,28 @@ static int backend_create_xenvif(struct backend_info *be) static void backend_disconnect(struct backend_info *be) { - if (be->vif) { + struct xenvif *vif = be->vif; + + if (vif) { unsigned int queue_index; - xen_unregister_watchers(be->vif); + xen_unregister_watchers(vif); #ifdef CONFIG_DEBUG_FS - xenvif_debugfs_delif(be->vif); + xenvif_debugfs_delif(vif); #endif /* CONFIG_DEBUG_FS */ - xenvif_disconnect_data(be->vif); - for (queue_index = 0; queue_index < be->vif->num_queues; ++queue_index) - xenvif_deinit_queue(&be->vif->queues[queue_index]); - - spin_lock(&be->vif->lock); - vfree(be->vif->queues); - be->vif->num_queues = 0; - be->vif->queues = NULL; - spin_unlock(&be->vif->lock); - - xenvif_disconnect_ctrl(be->vif); + xenvif_disconnect_data(vif); + for (queue_index = 0; + queue_index < vif->num_queues; + ++queue_index) + xenvif_deinit_queue(&vif->queues[queue_index]); + + spin_lock(&vif->lock); + vfree(vif->queues); + vif->num_queues = 0; + vif->queues = NULL; + spin_unlock(&vif->lock); + + xenvif_disconnect_ctrl(vif); } }