Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

stephen hemminger and committed by
David S. Miller
8f09898b 128296fc

+2 -23
-2
include/linux/socket.h
··· 305 305 /* IPX options */ 306 306 #define IPX_TYPE 1 307 307 308 - extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred); 309 - 310 308 extern int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov, 311 309 int offset, int len); 312 310 extern int csum_partial_copy_fromiovecend(unsigned char *kdata,
-2
include/net/sock.h
··· 1549 1549 1550 1550 struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force, 1551 1551 gfp_t priority); 1552 - struct sk_buff *sock_rmalloc(struct sock *sk, unsigned long size, int force, 1553 - gfp_t priority); 1554 1552 void sock_wfree(struct sk_buff *skb); 1555 1553 void skb_orphan_partial(struct sk_buff *skb); 1556 1554 void sock_rfree(struct sk_buff *skb);
+2 -19
net/core/sock.c
··· 925 925 EXPORT_SYMBOL(sock_setsockopt); 926 926 927 927 928 - void cred_to_ucred(struct pid *pid, const struct cred *cred, 929 - struct ucred *ucred) 928 + static void cred_to_ucred(struct pid *pid, const struct cred *cred, 929 + struct ucred *ucred) 930 930 { 931 931 ucred->pid = pid_vnr(pid); 932 932 ucred->uid = ucred->gid = -1; ··· 937 937 ucred->gid = from_kgid_munged(current_ns, cred->egid); 938 938 } 939 939 } 940 - EXPORT_SYMBOL_GPL(cred_to_ucred); 941 940 942 941 int sock_getsockopt(struct socket *sock, int level, int optname, 943 942 char __user *optval, int __user *optlen) ··· 1663 1664 return NULL; 1664 1665 } 1665 1666 EXPORT_SYMBOL(sock_wmalloc); 1666 - 1667 - /* 1668 - * Allocate a skb from the socket's receive buffer. 1669 - */ 1670 - struct sk_buff *sock_rmalloc(struct sock *sk, unsigned long size, int force, 1671 - gfp_t priority) 1672 - { 1673 - if (force || atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf) { 1674 - struct sk_buff *skb = alloc_skb(size, priority); 1675 - if (skb) { 1676 - skb_set_owner_r(skb, sk); 1677 - return skb; 1678 - } 1679 - } 1680 - return NULL; 1681 - } 1682 1667 1683 1668 /* 1684 1669 * Allocate a memory block from the socket's option memory buffer.