diff options
| author | Mark Brown <broonie@kernel.org> | 2020-10-28 21:36:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-28 21:36:35 +0000 |
| commit | ce038aeaee68f2e41c732b4b91c7185a1cac14b5 (patch) | |
| tree | baa463fe66186edf19b3ca65d002f66dd75f09a1 /net/unix/af_unix.c | |
| parent | 6d6bc54ab4f2404d46078abc04bf4dee4db01def (diff) | |
| parent | 3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff) | |
Merge tag 'v5.10-rc1' into asoc-5.10
Linux 5.10-rc1
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 92784e51ee7d..41c3303c3357 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -613,7 +613,6 @@ static int unix_listen(struct socket *sock, int backlog) int err; struct sock *sk = sock->sk; struct unix_sock *u = unix_sk(sk); - struct pid *old_pid = NULL; err = -EOPNOTSUPP; if (sock->type != SOCK_STREAM && sock->type != SOCK_SEQPACKET) @@ -634,7 +633,6 @@ static int unix_listen(struct socket *sock, int backlog) out_unlock: unix_state_unlock(sk); - put_pid(old_pid); out: return err; } @@ -878,7 +876,6 @@ static int unix_autobind(struct socket *sock) if (err) return err; - err = 0; if (u->addr) goto out; |