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>
This commit is contained in:
parent
128296fc3f
commit
8f09898bf0
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -925,8 +925,8 @@ set_rcvbuf:
|
|||
EXPORT_SYMBOL(sock_setsockopt);
|
||||
|
||||
|
||||
void cred_to_ucred(struct pid *pid, const struct cred *cred,
|
||||
struct ucred *ucred)
|
||||
static void cred_to_ucred(struct pid *pid, const struct cred *cred,
|
||||
struct ucred *ucred)
|
||||
{
|
||||
ucred->pid = pid_vnr(pid);
|
||||
ucred->uid = ucred->gid = -1;
|
||||
|
@ -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.
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue