diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2014-01-03 12:17:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-03 20:55:58 -0500 |
| commit | 8f09898bf02fc24b7a525e9cfc78f38dcdf3a4eb (patch) | |
| tree | 3d1203021bddbc009ea41bbe8e9c66ffe61afa08 /net/core/sock.c | |
| parent | 128296fc3fa2f607050cc2c5d6dc90237f3cedb3 (diff) | |
socket: cleanups
Namespace related cleaning
* make cred_to_ucred static
* remove unused sock_rmalloc function
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 5393b4b719d7..0358855576a8 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
| @@ -925,8 +925,8 @@ set_rcvbuf: | |||
| 925 | EXPORT_SYMBOL(sock_setsockopt); | 925 | EXPORT_SYMBOL(sock_setsockopt); |
| 926 | 926 | ||
| 927 | 927 | ||
| 928 | void cred_to_ucred(struct pid *pid, const struct cred *cred, | 928 | static void cred_to_ucred(struct pid *pid, const struct cred *cred, |
| 929 | struct ucred *ucred) | 929 | struct ucred *ucred) |
| 930 | { | 930 | { |
| 931 | ucred->pid = pid_vnr(pid); | 931 | ucred->pid = pid_vnr(pid); |
| 932 | ucred->uid = ucred->gid = -1; | 932 | ucred->uid = ucred->gid = -1; |
| @@ -937,7 +937,6 @@ void cred_to_ucred(struct pid *pid, const struct cred *cred, | |||
| 937 | ucred->gid = from_kgid_munged(current_ns, cred->egid); | 937 | ucred->gid = from_kgid_munged(current_ns, cred->egid); |
| 938 | } | 938 | } |
| 939 | } | 939 | } |
| 940 | EXPORT_SYMBOL_GPL(cred_to_ucred); | ||
| 941 | 940 | ||
| 942 | int sock_getsockopt(struct socket *sock, int level, int optname, | 941 | int sock_getsockopt(struct socket *sock, int level, int optname, |
| 943 | char __user *optval, int __user *optlen) | 942 | char __user *optval, int __user *optlen) |
| @@ -1666,22 +1665,6 @@ struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force, | |||
| 1666 | EXPORT_SYMBOL(sock_wmalloc); | 1665 | EXPORT_SYMBOL(sock_wmalloc); |
| 1667 | 1666 | ||
| 1668 | /* | 1667 | /* |
| 1669 | * Allocate a skb from the socket's receive buffer. | ||
| 1670 | */ | ||
| 1671 | struct sk_buff *sock_rmalloc(struct sock *sk, unsigned long size, int force, | ||
| 1672 | gfp_t priority) | ||
| 1673 | { | ||
| 1674 | if (force || atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf) { | ||
| 1675 | struct sk_buff *skb = alloc_skb(size, priority); | ||
| 1676 | if (skb) { | ||
| 1677 | skb_set_owner_r(skb, sk); | ||
| 1678 | return skb; | ||
| 1679 | } | ||
| 1680 | } | ||
| 1681 | return NULL; | ||
| 1682 | } | ||
| 1683 | |||
| 1684 | /* | ||
| 1685 | * Allocate a memory block from the socket's option memory buffer. | 1668 | * Allocate a memory block from the socket's option memory buffer. |
| 1686 | */ | 1669 | */ |
| 1687 | void *sock_kmalloc(struct sock *sk, int size, gfp_t priority) | 1670 | void *sock_kmalloc(struct sock *sk, int size, gfp_t priority) |