Commit d62607c3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

net: rename reference+tracking helpers 

Netdev reference helpers have a dev_ prefix for historic
reasons. Renaming the old helpers would be too much churn
but we can rename the tracking ones which are relatively
recent and should be the default for new code.

Rename:
 dev_hold_track()    -> netdev_hold()
 dev_put_track()     -> netdev_put()
 dev_replace_track() -> netdev_ref_replace()

Link: https://lore.kernel.org/r/20220608043955.919359-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a98a62e4

drivers/net/eql.c

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static void eql_kill_one_slave(slave_queue_t *queue, slave_t *slave) 
	list_del(&slave->list);

	queue->num_slaves--;

	slave->dev->flags &= ~IFF_SLAVE;

	dev_put_track(slave->dev, &slave->dev_tracker);

	netdev_put(slave->dev, &slave->dev_tracker);

	kfree(slave);

}
@@ -399,7 +399,7 @@ static int __eql_insert_slave(slave_queue_t *queue, slave_t *slave) 
		if (duplicate_slave)

			eql_kill_one_slave(queue, duplicate_slave);



		dev_hold_track(slave->dev, &slave->dev_tracker, GFP_ATOMIC);

		netdev_hold(slave->dev, &slave->dev_tracker, GFP_ATOMIC);

		list_add(&slave->list, &queue->all_slaves);

		queue->num_slaves++;

		slave->dev->flags |= IFF_SLAVE;

drivers/net/macsec.c

+2 −2
Original line number Diff line number Diff line
@@ -3462,7 +3462,7 @@ static int macsec_dev_init(struct net_device *dev) 
		memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);



	/* Get macsec's reference to real_dev */

	dev_hold_track(real_dev, &macsec->dev_tracker, GFP_KERNEL);

	netdev_hold(real_dev, &macsec->dev_tracker, GFP_KERNEL);



	return 0;

}
@@ -3710,7 +3710,7 @@ static void macsec_free_netdev(struct net_device *dev) 
	free_percpu(macsec->secy.tx_sc.stats);



	/* Get rid of the macsec's reference to real_dev */

	dev_put_track(macsec->real_dev, &macsec->dev_tracker);

	netdev_put(macsec->real_dev, &macsec->dev_tracker);

}



static void macsec_setup(struct net_device *dev)

drivers/net/macvlan.c

+2 −2
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static int macvlan_init(struct net_device *dev) 
	port->count += 1;



	/* Get macvlan's reference to lowerdev */

	dev_hold_track(lowerdev, &vlan->dev_tracker, GFP_KERNEL);

	netdev_hold(lowerdev, &vlan->dev_tracker, GFP_KERNEL);



	return 0;

}
@@ -1185,7 +1185,7 @@ static void macvlan_dev_free(struct net_device *dev) 
	struct macvlan_dev *vlan = netdev_priv(dev);



	/* Get rid of the macvlan's reference to lowerdev */

	dev_put_track(vlan->lowerdev, &vlan->dev_tracker);

	netdev_put(vlan->lowerdev, &vlan->dev_tracker);

}



void macvlan_common_setup(struct net_device *dev)

drivers/net/netconsole.c

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ static int netconsole_netdev_event(struct notifier_block *this, 
				__netpoll_cleanup(&nt->np);



				spin_lock_irqsave(&target_list_lock, flags);

				dev_put_track(nt->np.dev, &nt->np.dev_tracker);

				netdev_put(nt->np.dev, &nt->np.dev_tracker);

				nt->np.dev = NULL;

				nt->enabled = false;

				stopped = true;

drivers/net/vrf.c

+4 −4
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static void vrf_rt6_release(struct net_device *dev, struct net_vrf *vrf) 
	 */

	if (rt6) {

		dst = &rt6->dst;

		dev_replace_track(dst->dev, net->loopback_dev,

		netdev_ref_replace(dst->dev, net->loopback_dev,

				   &dst->dev_tracker, GFP_KERNEL);

		dst->dev = net->loopback_dev;

		dst_release(dst);
@@ -1061,7 +1061,7 @@ static void vrf_rtable_release(struct net_device *dev, struct net_vrf *vrf) 
	 */

	if (rth) {

		dst = &rth->dst;

		dev_replace_track(dst->dev, net->loopback_dev,

		netdev_ref_replace(dst->dev, net->loopback_dev,

				   &dst->dev_tracker, GFP_KERNEL);

		dst->dev = net->loopback_dev;

		dst_release(dst);