aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorJohn Heffner <jheffner@psc.edu>2007-09-12 04:44:19 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:01 -0400
commitd2e9117c7aa9544d910634e17e3519fd67155229 (patch)
tree531507ed5d2031fa80775036fec1b57584a236cb /net/core
parent02b3d34631831a19ee691516e233756b270eac6d (diff)
[NET]: Change type of owner in sock_lock_t to int, rename
The type of owner in sock_lock_t is currently (struct sock_iocb *), presumably for historical reasons. It is never used as this type, only tested as NULL or set to (void *)1. For clarity, this changes it to type int, and renames to owned, to avoid any possible type casting errors. Signed-off-by: John Heffner <jheffner@psc.edu> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 190de61cd648..beb924c248e8 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1585,9 +1585,9 @@ void fastcall lock_sock_nested(struct sock *sk, int subclass)
1585{ 1585{
1586 might_sleep(); 1586 might_sleep();
1587 spin_lock_bh(&sk->sk_lock.slock); 1587 spin_lock_bh(&sk->sk_lock.slock);
1588 if (sk->sk_lock.owner) 1588 if (sk->sk_lock.owned)
1589 __lock_sock(sk); 1589 __lock_sock(sk);
1590 sk->sk_lock.owner = (void *)1; 1590 sk->sk_lock.owned = 1;
1591 spin_unlock(&sk->sk_lock.slock); 1591 spin_unlock(&sk->sk_lock.slock);
1592 /* 1592 /*
1593 * The sk_lock has mutex_lock() semantics here: 1593 * The sk_lock has mutex_lock() semantics here:
@@ -1608,7 +1608,7 @@ void fastcall release_sock(struct sock *sk)
1608 spin_lock_bh(&sk->sk_lock.slock); 1608 spin_lock_bh(&sk->sk_lock.slock);
1609 if (sk->sk_backlog.tail) 1609 if (sk->sk_backlog.tail)
1610 __release_sock(sk); 1610 __release_sock(sk);
1611 sk->sk_lock.owner = NULL; 1611 sk->sk_lock.owned = 0;
1612 if (waitqueue_active(&sk->sk_lock.wq)) 1612 if (waitqueue_active(&sk->sk_lock.wq))
1613 wake_up(&sk->sk_lock.wq); 1613 wake_up(&sk->sk_lock.wq);
1614 spin_unlock_bh(&sk->sk_lock.slock); 1614 spin_unlock_bh(&sk->sk_lock.slock);