diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-06 06:03:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 07:34:24 +0100 |
| commit | bf8e56bfc4fcfcef9f08e6233dc619706807893a (patch) | |
| tree | 9f676974aab7ee5e9eef8f81a62ea9b6408c5ed4 /net/core/sock.c | |
| parent | ip_frag: dont touch device refcount (diff) | |
| download | linux-bf8e56bfc4fcfcef9f08e6233dc619706807893a.tar.xz linux-bf8e56bfc4fcfcef9f08e6233dc619706807893a.zip | |
net: sock_bindtodevice() RCU-ification
Avoid dev_hold()/dev_put() in sock_bindtodevice()
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 5a51512f638a..38820eaecd43 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -420,14 +420,16 @@ static int sock_bindtodevice(struct sock *sk, char __user *optval, int optlen) if (devname[0] == '\0') { index = 0; } else { - struct net_device *dev = dev_get_by_name(net, devname); + struct net_device *dev; + rcu_read_lock(); + dev = dev_get_by_name_rcu(net, devname); + if (dev) + index = dev->ifindex; + rcu_read_unlock(); ret = -ENODEV; if (!dev) goto out; - - index = dev->ifindex; - dev_put(dev); } lock_sock(sk); |