summaryrefslogtreecommitdiff
path: root/net/socket.c
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2017-07-24 20:25:22 +0300
committerDavid S. Miller <davem@davemloft.net>2017-07-25 22:31:37 +0300
commit614d79c09e03d4a421f6d7eab1804600db33e04e (patch)
treeb570331c2ce49ad92d9eb374893421234a2b0e42 /net/socket.c
parent3754b87a4e2d8cad644cea9713fed7842504991a (diff)
downloadlinux-614d79c09e03d4a421f6d7eab1804600db33e04e.tar.xz
socket: fix set not used warning
The variable owned_by_user is always set, but only used when kernel is configured with LOCKDEP enabled. Get rid of the warning by moving the code to put the call to owned_by_user into the the rcu_protected call. Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/socket.c b/net/socket.c
index bf2122691fba..79d9bb964cd8 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -3404,7 +3404,6 @@ u32 kernel_sock_ip_overhead(struct sock *sk)
struct inet_sock *inet;
struct ip_options_rcu *opt;
u32 overhead = 0;
- bool owned_by_user;
#if IS_ENABLED(CONFIG_IPV6)
struct ipv6_pinfo *np;
struct ipv6_txoptions *optv6 = NULL;
@@ -3413,13 +3412,12 @@ u32 kernel_sock_ip_overhead(struct sock *sk)
if (!sk)
return overhead;
- owned_by_user = sock_owned_by_user(sk);
switch (sk->sk_family) {
case AF_INET:
inet = inet_sk(sk);
overhead += sizeof(struct iphdr);
opt = rcu_dereference_protected(inet->inet_opt,
- owned_by_user);
+ sock_owned_by_user(sk));
if (opt)
overhead += opt->opt.optlen;
return overhead;
@@ -3429,7 +3427,7 @@ u32 kernel_sock_ip_overhead(struct sock *sk)
overhead += sizeof(struct ipv6hdr);
if (np)
optv6 = rcu_dereference_protected(np->opt,
- owned_by_user);
+ sock_owned_by_user(sk));
if (optv6)
overhead += (optv6->opt_flen + optv6->opt_nflen);
return overhead;