mlx4: don't duplicate kvfree()

Subsystems: mellanox mlx4 core vpi driver, networking drivers, the rest

3 messages, 3 authors, 2014-11-21 · open the first message on its own page

mlx4: don't duplicate kvfree()

From: Al Viro <viro@ZenIV.linux.org.uk>
Date: 2014-11-20 08:15:41

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index 193a6ad..d6f5496 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -130,10 +130,7 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
 
 err_out_free:
 	for (i = 0; i <= buddy->max_order; ++i)
-		if (buddy->bits[i] && is_vmalloc_addr(buddy->bits[i]))
-			vfree(buddy->bits[i]);
-		else
-			kfree(buddy->bits[i]);
+		kvfree(buddy->bits[i]);
 
 err_out:
 	kfree(buddy->bits);
@@ -147,10 +144,7 @@ static void mlx4_buddy_cleanup(struct mlx4_buddy *buddy)
 	int i;
 
 	for (i = 0; i <= buddy->max_order; ++i)
-		if (is_vmalloc_addr(buddy->bits[i]))
-			vfree(buddy->bits[i]);
-		else
-			kfree(buddy->bits[i]);
+		kvfree(buddy->bits[i]);
 
 	kfree(buddy->bits);
 	kfree(buddy->num_free);

Re: mlx4: don't duplicate kvfree()

From: Amir Vadai <hidden>
Date: 2014-11-20 08:38:13

On Thu, Nov 20, 2014 at 10:15 AM, Al Viro [off-list ref] wrote:
quoted hunk
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index 193a6ad..d6f5496 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -130,10 +130,7 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)

 err_out_free:
        for (i = 0; i <= buddy->max_order; ++i)
-               if (buddy->bits[i] && is_vmalloc_addr(buddy->bits[i]))
-                       vfree(buddy->bits[i]);
-               else
-                       kfree(buddy->bits[i]);
+               kvfree(buddy->bits[i]);

 err_out:
        kfree(buddy->bits);
@@ -147,10 +144,7 @@ static void mlx4_buddy_cleanup(struct mlx4_buddy *buddy)
        int i;

        for (i = 0; i <= buddy->max_order; ++i)
-               if (is_vmalloc_addr(buddy->bits[i]))
-                       vfree(buddy->bits[i]);
-               else
-                       kfree(buddy->bits[i]);
+               kvfree(buddy->bits[i]);

        kfree(buddy->bits);
        kfree(buddy->num_free);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Thanks Al

Acked-by: Amir Vadai <redacted>

Re: mlx4: don't duplicate kvfree()

From: David Miller <davem@davemloft.net>
Date: 2014-11-21 19:58:38

From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Thu, 20 Nov 2014 08:15:38 +0000
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help