diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-11-08 17:07:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-08 17:07:07 -0500 |
| commit | e56c57d0d3fdbbdf583d3af96bfb803b8dfa713e (patch) | |
| tree | f415160c8fd39efebfc49d41493cc5b964503482 /include/net | |
| parent | 9ecd04bc04af7df98b3a93c571e31b6ef6a90681 (diff) | |
| download | linux-e56c57d0d3fdbbdf583d3af96bfb803b8dfa713e.tar.gz linux-e56c57d0d3fdbbdf583d3af96bfb803b8dfa713e.tar.bz2 linux-e56c57d0d3fdbbdf583d3af96bfb803b8dfa713e.zip | |
net: rename sk_clone to sk_clone_lock
Make clear that sk_clone() and inet_csk_clone() return a locked socket.
Add _lock() prefix and kerneldoc.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/inet_connection_sock.h | 6 | ||||
| -rw-r--r-- | include/net/sock.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index e6db62e756dc..dbf9aab34c82 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h @@ -143,9 +143,9 @@ static inline void *inet_csk_ca(const struct sock *sk) return (void *)inet_csk(sk)->icsk_ca_priv; } -extern struct sock *inet_csk_clone(struct sock *sk, - const struct request_sock *req, - const gfp_t priority); +extern struct sock *inet_csk_clone_lock(const struct sock *sk, + const struct request_sock *req, + const gfp_t priority); enum inet_csk_ack_state_t { ICSK_ACK_SCHED = 1, diff --git a/include/net/sock.h b/include/net/sock.h index abb6e0f0c3c3..67cd4581b6da 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1089,8 +1089,8 @@ extern struct sock *sk_alloc(struct net *net, int family, struct proto *prot); extern void sk_free(struct sock *sk); extern void sk_release_kernel(struct sock *sk); -extern struct sock *sk_clone(const struct sock *sk, - const gfp_t priority); +extern struct sock *sk_clone_lock(const struct sock *sk, + const gfp_t priority); extern struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force, |