iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: use the new API kvfree()

Browse Source 
It is available since v3.15-rc5.

Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
WANG Cong 2014-06-02 15:55:22 -07:00 committed by David S. Miller
parent 9638f6713f
commit 4cb28970a2
11 changed files with 12 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/core/dev.c
View File

@ -5933,10 +5933,7 @@ static void netdev_init_one_queue(struct net_device *dev,
static void netif_free_tx_queues(struct net_device *dev)
{
if (is_vmalloc_addr(dev->_tx))
vfree(dev->_tx);
else
kfree(dev->_tx);
kvfree(dev->_tx);
}
static int netif_alloc_netdev_queues(struct net_device *dev)
@ -6410,10 +6407,7 @@ void netdev_freemem(struct net_device *dev)
{
char *addr = (char *)dev - dev->padded;
if (is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
kvfree(addr);
}
/**

5
net/ipv4/tcp_metrics.c
View File

@ -1159,10 +1159,7 @@ static void __net_exit tcp_net_metrics_exit(struct net *net)
tm = next;
}
}
if (is_vmalloc_addr(net->ipv4.tcp_metrics_hash))
vfree(net->ipv4.tcp_metrics_hash);
else
kfree(net->ipv4.tcp_metrics_hash);
kvfree(net->ipv4.tcp_metrics_hash);
}
static __net_initdata struct pernet_operations tcp_net_metrics_ops = {

5
net/netfilter/ipset/ip_set_core.c
View File

@ -271,10 +271,7 @@ ip_set_free(void *members)
{
pr_debug("%p: free with %s\n", members,
is_vmalloc_addr(members) ? "vfree" : "kfree");
if (is_vmalloc_addr(members))
vfree(members);
else
kfree(members);
kvfree(members);
}
EXPORT_SYMBOL_GPL(ip_set_free);

5
net/netfilter/nft_hash.c
View File

@ -76,10 +76,7 @@ static bool nft_hash_lookup(const struct nft_set *set,
static void nft_hash_tbl_free(const struct nft_hash_table *tbl)
{
if (is_vmalloc_addr(tbl))
vfree(tbl);
else
kfree(tbl);
kvfree(tbl);
}
static unsigned int nft_hash_tbl_size(unsigned int nelem)

5
net/netfilter/xt_recent.c
View File

@ -313,10 +313,7 @@ out:
static void recent_table_free(void *addr)
{
if (is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
kvfree(addr);
}
static int recent_mt_check(const struct xt_mtchk_param *par,

7
net/sched/sch_choke.c
View File

@ -391,12 +391,7 @@ static const struct nla_policy choke_policy[TCA_CHOKE_MAX + 1] = {
static void choke_free(void *addr)
{
if (addr) {
if (is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
}
kvfree(addr);
}
static int choke_change(struct Qdisc *sch, struct nlattr *opt)

5
net/sched/sch_fq.c
View File

@ -591,10 +591,7 @@ static void *fq_alloc_node(size_t sz, int node)
static void fq_free(void *addr)
{
if (addr && is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
kvfree(addr);
}
static int fq_resize(struct Qdisc *sch, u32 log)

7
net/sched/sch_fq_codel.c
View File

@ -365,12 +365,7 @@ static void *fq_codel_zalloc(size_t sz)
static void fq_codel_free(void *addr)
{
if (addr) {
if (is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
}
kvfree(addr);
}
static void fq_codel_destroy(struct Qdisc *sch)

7
net/sched/sch_hhf.c
View File

@ -494,12 +494,7 @@ static void *hhf_zalloc(size_t sz)
static void hhf_free(void *addr)
{
if (addr) {
if (is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
}
kvfree(addr);
}
static void hhf_destroy(struct Qdisc *sch)

7
net/sched/sch_netem.c
View File

@ -648,12 +648,7 @@ static void netem_reset(struct Qdisc *sch)
static void dist_free(struct disttable *d)
{
if (d) {
if (is_vmalloc_addr(d))
vfree(d);
else
kfree(d);
}
kvfree(d);
}
/*

7
net/sched/sch_sfq.c
View File

@ -716,12 +716,7 @@ static void *sfq_alloc(size_t sz)
static void sfq_free(void *addr)
{
if (addr) {
if (is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
}
kvfree(addr);
}
static void sfq_destroy(struct Qdisc *sch)