]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
xen-netback: keep a local pointer for vif in backend_disconnect()
authorPaul Durrant <Paul.Durrant@citrix.com>
Thu, 2 Mar 2017 12:54:25 +0000 (12:54 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 3 Mar 2017 17:36:15 +0000 (09:36 -0800)
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 <paul.durrant@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/xen-netback/xenbus.c

index bb854f92f5a5cd4a531082cf04cf28c0f6801c42..d82ddc913b4c93f103572407404ab8b70df965f5 100644 (file)
@@ -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);
        }
 }