Commit 8f09898b authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

socket: cleanups 



Namespace related cleaning

 * make cred_to_ucred static
 * remove unused sock_rmalloc function

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 128296fc

include/linux/socket.h

+0 −2
Original line number Diff line number Diff line
@@ -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,

include/net/sock.h

+0 −2
Original line number Diff line number Diff line
@@ -1549,8 +1549,6 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority); 


struct 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);

net/core/sock.c

+2 −19
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname, 
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, const struct cred *cred, 
		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)
@@ -1665,22 +1664,6 @@ struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force, 
}

EXPORT_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.

 */