52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From d78ae2894c307cabcf454877f6a45ed442778d02 Mon Sep 17 00:00:00 2001
|
|
From: Wei Liu <wei.liu2@citrix.com>
|
|
Date: Tue, 12 Aug 2014 11:59:30 +0100
|
|
Subject: [PATCH 07/14] xen-netback: fix debugfs entry creation
|
|
Origin: https://git.kernel.org/linus/628fa76b09d7b0923c142631fc25b6affbfb868d
|
|
|
|
The original code is bogus. The function gets called in a loop which
|
|
leaks entries created in previous rounds.
|
|
|
|
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
|
|
Cc: Zoltan Kiss <zoltan.kiss@citrix.com>
|
|
Cc: Ian Campbell <ian.campbell@citrix.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
(cherry picked from commit 628fa76b09d7b0923c142631fc25b6affbfb868d)
|
|
---
|
|
drivers/net/xen-netback/xenbus.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
|
|
index 4c9041e..9c47b89 100644
|
|
--- a/drivers/net/xen-netback/xenbus.c
|
|
+++ b/drivers/net/xen-netback/xenbus.c
|
|
@@ -174,10 +174,9 @@ static const struct file_operations xenvif_dbg_io_ring_ops_fops = {
|
|
.write = xenvif_write_io_ring,
|
|
};
|
|
|
|
-static void xenvif_debugfs_addif(struct xenvif_queue *queue)
|
|
+static void xenvif_debugfs_addif(struct xenvif *vif)
|
|
{
|
|
struct dentry *pfile;
|
|
- struct xenvif *vif = queue->vif;
|
|
int i;
|
|
|
|
if (IS_ERR_OR_NULL(xen_netback_dbg_root))
|
|
@@ -736,10 +735,11 @@ static void connect(struct backend_info *be)
|
|
be->vif->num_queues = queue_index;
|
|
goto err;
|
|
}
|
|
+ }
|
|
+
|
|
#ifdef CONFIG_DEBUG_FS
|
|
- xenvif_debugfs_addif(queue);
|
|
+ xenvif_debugfs_addif(be->vif);
|
|
#endif /* CONFIG_DEBUG_FS */
|
|
- }
|
|
|
|
/* Initialisation completed, tell core driver the number of
|
|
* active queues.
|
|
--
|
|
1.7.10.4
|
|
|