* mlx4: don't duplicate kvfree()
@ 2014-11-20 8:15 Al Viro
2014-11-20 8:38 ` Amir Vadai
2014-11-21 19:58 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Al Viro @ 2014-11-20 8:15 UTC (permalink / raw)
To: Amir Vadai; +Cc: linux-kernel, netdev
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);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: mlx4: don't duplicate kvfree()
2014-11-20 8:15 mlx4: don't duplicate kvfree() Al Viro
@ 2014-11-20 8:38 ` Amir Vadai
2014-11-21 19:58 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Amir Vadai @ 2014-11-20 8:38 UTC (permalink / raw)
To: Al Viro; +Cc: Amir Vadai, linux-kernel@vger.kernel.org, netdev
On Thu, Nov 20, 2014 at 10:15 AM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> 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 <amirv@mellanox.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: mlx4: don't duplicate kvfree()
2014-11-20 8:15 mlx4: don't duplicate kvfree() Al Viro
2014-11-20 8:38 ` Amir Vadai
@ 2014-11-21 19:58 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-11-21 19:58 UTC (permalink / raw)
To: viro; +Cc: amirv, linux-kernel, netdev
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-11-21 19:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-20 8:15 mlx4: don't duplicate kvfree() Al Viro
2014-11-20 8:38 ` Amir Vadai
2014-11-21 19:58 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).