[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20091105.223921.83639611.davem@davemloft.net>
Date: Thu, 05 Nov 2009 22:39:21 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: eric.dumazet@...il.com
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH net-next-2.6] net: sock_bindtodevice() RCU-ification
From: David Miller <davem@...emloft.net>
Date: Thu, 05 Nov 2009 21:08:30 -0800 (PST)
> From: Eric Dumazet <eric.dumazet@...il.com>
> Date: Wed, 04 Nov 2009 23:36:44 +0100
>
>> Avoid dev_hold()/dev_put() in sock_bindtodevice()
>>
>> Signed-off-by: Eric Dumazet <eric.dumazet@...il.com>
>
> Applied to net-next-2.6, thanks.
Eric I had to add the following patch to cure a build
warning after this, just FYI:
net: Fix build warning in sock_bindtodevice().
net/core/sock.c: In function 'sock_setsockopt':
net/core/sock.c:396: warning: 'index' may be used uninitialized in this function
net/core/sock.c:396: note: 'index' was declared here
GCC can't see that all paths initialize index, so just
set it to the default (0) and eliminate the specific
code block that handles the null device name string.
Signed-off-by: David S. Miller <davem@...emloft.net>
---
net/core/sock.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index 38820ea..76ff58d 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -417,9 +417,8 @@ static int sock_bindtodevice(struct sock *sk, char __user *optval, int optlen)
if (copy_from_user(devname, optval, optlen))
goto out;
- if (devname[0] == '\0') {
- index = 0;
- } else {
+ index = 0;
+ if (devname[0] != '\0') {
struct net_device *dev;
rcu_read_lock();
--
1.6.5.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists