netpoll: allocate netdev tracker right away

Commit 5fa5ae605821 ("netpoll: add net device refcount tracker to struct netpoll")
was part of one of the initial netdev tracker introduction patches.
It added an explicit netdev_tracker_alloc() for netpoll, presumably
because the flow of the function is somewhat odd.
After most of the core networking stack was converted to use
the tracking hold() variants, netpoll's call to old dev_hold()
stands out a bit.

np is allocated by the caller and ready to use, we can use
netdev_hold() here, even tho np->ndev will only be set to
ndev inside __netpoll_setup().

Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index e6a739b1afa9e480ce3ca6b2adae43b667ae8cf7..543007f159f99767c9865928f791a6f5bfcd54fb 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -690,7 +690,7 @@ int netpoll_setup(struct netpoll *np)
                err = -ENODEV;
                goto unlock;
        }
-       dev_hold(ndev);
+       netdev_hold(ndev, &np->dev_tracker, GFP_KERNEL);
 
        if (netdev_master_upper_dev_get(ndev)) {
                np_err(np, "%s is a slave device, aborting\n", np->dev_name);
@@ -783,12 +783,11 @@ put_noaddr:
        err = __netpoll_setup(np, ndev);
        if (err)
                goto put;
-       netdev_tracker_alloc(ndev, &np->dev_tracker, GFP_KERNEL);
        rtnl_unlock();
        return 0;
 
 put:
-       dev_put(ndev);
+       netdev_put(ndev, &np->dev_tracker);
 unlock:
        rtnl_unlock();
        return err;