Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 122ec6ff authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

netlabel: remove dev_put() calls 



Use dev_get_by_name_rcu() to avoid dev_put() calls,
in sections already inside a rcu_read_lock()

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31ef30c7

net/netlabel/netlabel_unlabeled.c

+2 −4
Original line number Diff line number Diff line
@@ -472,13 +472,12 @@ int netlbl_unlhsh_add(struct net *net, 


	rcu_read_lock();

	if (dev_name != NULL) {

		dev = dev_get_by_name(net, dev_name);

		dev = dev_get_by_name_rcu(net, dev_name);

		if (dev == NULL) {

			ret_val = -ENODEV;

			goto unlhsh_add_return;

		}

		ifindex = dev->ifindex;

		dev_put(dev);

		iface = netlbl_unlhsh_search_iface(ifindex);

	} else {

		ifindex = 0;
@@ -737,13 +736,12 @@ int netlbl_unlhsh_remove(struct net *net, 


	rcu_read_lock();

	if (dev_name != NULL) {

		dev = dev_get_by_name(net, dev_name);

		dev = dev_get_by_name_rcu(net, dev_name);

		if (dev == NULL) {

			ret_val = -ENODEV;

			goto unlhsh_remove_return;

		}

		iface = netlbl_unlhsh_search_iface(dev->ifindex);

		dev_put(dev);

	} else

		iface = rcu_dereference(netlbl_unlhsh_def);

	if (iface == NULL) {