socket: cleanup
Subsystems (3)
PATCH 1/1 socket: cleanup
Found while doing namespace checks
* make cred_to_ucred static
* remove unused sock_rmalloc function
Signed-off-by Stephen Hemminger <[email protected]>
--- include/linux/socket.h | 2 -- include/net/sock.h | 2 -- net/core/sock.c | 19 +------------------ 3 files changed, 1 insertion(+), 22 deletions(-)
include/linux/socket.h +0 -2
@@ -305,8 +305,6 @@ struct ucred {/* IPX options */ #define IPX_TYPE 1 -extern void cred_to_ucred (struct pid *pid,const struct cred *cred,struct ucred *ucred); -extern int memcpy_fromiovecend (unsigned char *kdata,const struct iovec *iov,int offset,int len); extern int csum_partial_copy_fromiovecend(unsigned char *kdata,
net/core/sock.c +1 -18
@@ -925,7 +925,7 @@ set_rcvbuf:EXPORT_SYMBOL (sock_setsockopt); -void cred_to_ucred (struct pid *pid,const struct cred *cred, +static void cred_to_ucred (struct pid *pid,const struct cred *cred,struct ucred *ucred) { ucred->pid =pid_vnr (pid);
@@ -937,7 +937,6 @@ void cred_to_ucred(struct pid *pid, cons ucred->gid =from_kgid_munged (current_ns, cred->egid); } } -EXPORT_SYMBOL_GPL (cred_to_ucred);int sock_getsockopt (struct socket *sock,int level,int optname,char __user *optval,int __user *optlen)
@@ -1666,22 +1665,6 @@ struct sk_buff *sock_wmalloc(struct sockEXPORT_SYMBOL (sock_wmalloc);/* -* Allocate a skb from the socket's receive buffer. -*/ -struct sk_buff *sock_rmalloc (struct sock *sk,unsigned long size,int force, -gfp_t priority) -{ -if (force ||atomic_read (&sk->sk_rmem_alloc) < sk->sk_rcvbuf) { -struct sk_buff *skb =alloc_skb (size, priority); -if (skb) { -skb_set_owner_r (skb, sk); -return skb; - } - } -return NULL ; -} - -/* * Allocate a memory block from the socket's option memory buffer. */ void *sock_kmalloc (struct sock *sk,int size,gfp_t priority)
include/net/sock.h +0 -2
@@ -1535,8 +1535,6 @@ struct sock *sk_clone_lock(const structstruct sk_buff *sock_wmalloc (struct sock *sk,unsigned long size,int force,gfp_t priority); -struct sk_buff *sock_rmalloc (struct sock *sk,unsigned long size,int force, -gfp_t priority);void sock_wfree (struct sk_buff *skb);void skb_orphan_partial (struct sk_buff *skb);void sock_rfree (struct sk_buff *skb);
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Mon, 30 Dec 2013 10:40:12 -0800
net/core/sock.c set_rcvbuf: · line 929
Quoted 3 lines
net/core/sock.c +1
-1-void cred_to_ucred (struct pid *pid,const struct cred *cred, +static void cred_to_ucred (struct pid *pid,const struct cred *cred,struct ucred *ucred)
Please reindent the args.