Commit 29ca1c5a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller

net-sysfs: 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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 214fa1c4
...@@ -1336,8 +1336,7 @@ static ssize_t xps_rxqs_show(struct netdev_queue *queue, char *buf) ...@@ -1336,8 +1336,7 @@ static ssize_t xps_rxqs_show(struct netdev_queue *queue, char *buf)
if (tc < 0) if (tc < 0)
return -EINVAL; return -EINVAL;
} }
mask = kcalloc(BITS_TO_LONGS(dev->num_rx_queues), sizeof(long), mask = bitmap_zalloc(dev->num_rx_queues, GFP_KERNEL);
GFP_KERNEL);
if (!mask) if (!mask)
return -ENOMEM; return -ENOMEM;
...@@ -1366,7 +1365,7 @@ static ssize_t xps_rxqs_show(struct netdev_queue *queue, char *buf) ...@@ -1366,7 +1365,7 @@ static ssize_t xps_rxqs_show(struct netdev_queue *queue, char *buf)
rcu_read_unlock(); rcu_read_unlock();
len = bitmap_print_to_pagebuf(false, buf, mask, dev->num_rx_queues); len = bitmap_print_to_pagebuf(false, buf, mask, dev->num_rx_queues);
kfree(mask); bitmap_free(mask);
return len < PAGE_SIZE ? len : -EINVAL; return len < PAGE_SIZE ? len : -EINVAL;
} }
...@@ -1382,8 +1381,7 @@ static ssize_t xps_rxqs_store(struct netdev_queue *queue, const char *buf, ...@@ -1382,8 +1381,7 @@ static ssize_t xps_rxqs_store(struct netdev_queue *queue, const char *buf,
if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
return -EPERM; return -EPERM;
mask = kcalloc(BITS_TO_LONGS(dev->num_rx_queues), sizeof(long), mask = bitmap_zalloc(dev->num_rx_queues, GFP_KERNEL);
GFP_KERNEL);
if (!mask) if (!mask)
return -ENOMEM; return -ENOMEM;
...@@ -1391,7 +1389,7 @@ static ssize_t xps_rxqs_store(struct netdev_queue *queue, const char *buf, ...@@ -1391,7 +1389,7 @@ static ssize_t xps_rxqs_store(struct netdev_queue *queue, const char *buf,
err = bitmap_parse(buf, len, mask, dev->num_rx_queues); err = bitmap_parse(buf, len, mask, dev->num_rx_queues);
if (err) { if (err) {
kfree(mask); bitmap_free(mask);
return err; return err;
} }
...@@ -1399,7 +1397,7 @@ static ssize_t xps_rxqs_store(struct netdev_queue *queue, const char *buf, ...@@ -1399,7 +1397,7 @@ static ssize_t xps_rxqs_store(struct netdev_queue *queue, const char *buf,
err = __netif_set_xps_queue(dev, mask, index, true); err = __netif_set_xps_queue(dev, mask, index, true);
cpus_read_unlock(); cpus_read_unlock();
kfree(mask); bitmap_free(mask);
return err ? : len; return err ? : len;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment