net: Pass kern from net_proto_family.create to sk_alloc
In preparation for changing how struct net is refcounted on kernel sockets pass the knowledge that we are creating a kernel socket from sock_create_kern through to sk_alloc. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

父節點
eeb1bd5c40
當前提交
11aa9c28b4
@@ -433,7 +433,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol,
|
||||
if (sock->type != SOCK_SEQPACKET || protocol != 0)
|
||||
return -ESOCKTNOSUPPORT;
|
||||
|
||||
sk = sk_alloc(net, PF_NETROM, GFP_ATOMIC, &nr_proto);
|
||||
sk = sk_alloc(net, PF_NETROM, GFP_ATOMIC, &nr_proto, kern);
|
||||
if (sk == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -476,7 +476,7 @@ static struct sock *nr_make_new(struct sock *osk)
|
||||
if (osk->sk_type != SOCK_SEQPACKET)
|
||||
return NULL;
|
||||
|
||||
sk = sk_alloc(sock_net(osk), PF_NETROM, GFP_ATOMIC, osk->sk_prot);
|
||||
sk = sk_alloc(sock_net(osk), PF_NETROM, GFP_ATOMIC, osk->sk_prot, 0);
|
||||
if (sk == NULL)
|
||||
return NULL;
|
||||
|
||||
|
Reference in New Issue
Block a user