forked from Minki/linux
net: Remove unnecessary variables
It is not necessary to define variables to receive -ENOMEM, directly return -ENOMEM. Signed-off-by: zuoqilin <zuoqilin@yulong.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
parent
fe9f1d8779
commit
a925316af8
@ -141,7 +141,6 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol,
|
|||||||
struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id);
|
struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id);
|
||||||
struct sock *sk;
|
struct sock *sk;
|
||||||
struct pfkey_sock *pfk;
|
struct pfkey_sock *pfk;
|
||||||
int err;
|
|
||||||
|
|
||||||
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
|
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
@ -150,10 +149,9 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol,
|
|||||||
if (protocol != PF_KEY_V2)
|
if (protocol != PF_KEY_V2)
|
||||||
return -EPROTONOSUPPORT;
|
return -EPROTONOSUPPORT;
|
||||||
|
|
||||||
err = -ENOMEM;
|
|
||||||
sk = sk_alloc(net, PF_KEY, GFP_KERNEL, &key_proto, kern);
|
sk = sk_alloc(net, PF_KEY, GFP_KERNEL, &key_proto, kern);
|
||||||
if (sk == NULL)
|
if (sk == NULL)
|
||||||
goto out;
|
return -ENOMEM;
|
||||||
|
|
||||||
pfk = pfkey_sk(sk);
|
pfk = pfkey_sk(sk);
|
||||||
mutex_init(&pfk->dump_lock);
|
mutex_init(&pfk->dump_lock);
|
||||||
@ -169,8 +167,6 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol,
|
|||||||
pfkey_insert(sk);
|
pfkey_insert(sk);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
out:
|
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pfkey_release(struct socket *sock)
|
static int pfkey_release(struct socket *sock)
|
||||||
|
Loading…
Reference in New Issue
Block a user