Skip to contentSkip to conversation

bridge: Switch to bitmap_zalloc()

PATCH Applied Andy Shevchenko 2 participants 2 messages Aug 30, 2018 – Sep 1, 2018

Subsystems (3)
Networking Network drivers Ethernet bridge
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 bridge: Switch to bitmap_zalloc()

Switch to bitmap_zalloc() to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.

Signed-off-by Andy Shevchenko <[email protected]>
---
 net/bridge/br_if.c   | 5 ++---
 net/bridge/br_vlan.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)
net/bridge/br_if.c +2 -3
index 0363f1bdc401..3bb66508f07d 100644
@@ -394,8 +394,7 @@ static int find_portno(struct net_bridge *br)
 	struct net_bridge_port *p;
 	unsigned long *inuse;
 
-	inuse = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),
-			GFP_KERNEL);
+	inuse = bitmap_zalloc(BR_MAX_PORTS, GFP_KERNEL);
 	if (!inuse)
 		return -ENOMEM;
 

@@ -404,7 +403,7 @@ static int find_portno(struct net_bridge *br)
 		set_bit(p->port_no, inuse);
 	}
 	index = find_first_zero_bit(inuse, BR_MAX_PORTS);
-	kfree(inuse);
+	bitmap_free(inuse);
 
 	return (index >= BR_MAX_PORTS) ? -EXFULL : index;
 }
net/bridge/br_vlan.c +2 -3
index 7df269092103..bb6ba794864f 100644
@@ -877,8 +877,7 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)
 		return 0;
 	}
 
-	changed = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),
-			  GFP_KERNEL);
+	changed = bitmap_zalloc(BR_MAX_PORTS, GFP_KERNEL);
 	if (!changed)
 		return -ENOMEM;
 

@@ -925,7 +924,7 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)
 	br->default_pvid = pvid;
 
 out:
-	kfree(changed);
+	bitmap_free(changed);
 	return err;
 
 err_port:
Signature · 1 line
2.18.0
maintainer Applied
#1 lore raw

From: Andy Shevchenko <[email protected]>
Date: Thu, 30 Aug 2018 13:33:18 +0300

Quoted 4 lines

Switch to bitmap_zalloc() to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.

Signed-off-by Andy Shevchenko <[email protected]>

Applied to net-next, thanks.