net-sysfs: Switch to bitmap_zalloc()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 4 Mar 2019 09:48:56 +0000 (11:48 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Mar 2019 18:20:39 +0000 (10:20 -0800)
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 <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/net-sysfs.c

index 7c5061123eade457a572a7bb612fa21cbad3f792..76161503527bde165733a7725d69bcb0445c463e 100644 (file)
@@ -1336,8 +1336,7 @@ static ssize_t xps_rxqs_show(struct netdev_queue *queue, char *buf)
                if (tc < 0)
                        return -EINVAL;
        }
-       mask = kcalloc(BITS_TO_LONGS(dev->num_rx_queues), sizeof(long),
-                      GFP_KERNEL);
+       mask = bitmap_zalloc(dev->num_rx_queues, GFP_KERNEL);
        if (!mask)
                return -ENOMEM;
 
@@ -1366,7 +1365,7 @@ out_no_maps:
        rcu_read_unlock();
 
        len = bitmap_print_to_pagebuf(false, buf, mask, dev->num_rx_queues);
-       kfree(mask);
+       bitmap_free(mask);
 
        return len < PAGE_SIZE ? len : -EINVAL;
 }
@@ -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))
                return -EPERM;
 
-       mask = kcalloc(BITS_TO_LONGS(dev->num_rx_queues), sizeof(long),
-                      GFP_KERNEL);
+       mask = bitmap_zalloc(dev->num_rx_queues, GFP_KERNEL);
        if (!mask)
                return -ENOMEM;
 
@@ -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);
        if (err) {
-               kfree(mask);
+               bitmap_free(mask);
                return err;
        }
 
@@ -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);
        cpus_read_unlock();
 
-       kfree(mask);
+       bitmap_free(mask);
        return err ? : len;
 }