Merge tag 'v5.10-rc1' into regulator-5.10

[linux-2.6-microblaze.git] / net / unix / af_unix.c

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 92784e5..41c3303 100644 (file)
--- 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;