From a341045945579363ce3f19dc9a10d70f1fe7d218 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 17 Sep 2012 00:52:41 +0000 Subject: [PATCH] --- yaml --- r: 327983 b: refs/heads/master c: e04dae840883ca31cea01e5958c09eee005cf4de h: refs/heads/master i: 327981: a28adcdb1d2a2444b071bdc9982a89093f2ae677 327979: afc89fa7387f491ba5e86e43c28ca7efffba6baa 327975: ea26676d5484e7dea563f7caedc2cee0d3d79272 327967: 558461930d4e1cb46030d08d974b6064dd55e145 v: v3 --- [refs] | 2 +- trunk/net/unix/af_unix.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9d2fe64c9db2..d1657cee964f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e57b8bdb4833366fd23d03a066c7eb8acc5736c7 +refs/heads/master: e04dae840883ca31cea01e5958c09eee005cf4de diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c index 8a84ab64cafd..5b5c876c80e9 100644 --- a/trunk/net/unix/af_unix.c +++ b/trunk/net/unix/af_unix.c @@ -441,7 +441,7 @@ static int unix_release_sock(struct sock *sk, int embrion) /* ---- Socket is dead now and most probably destroyed ---- */ /* - * Fixme: BSD difference: In BSD all sockets connected to use get + * Fixme: BSD difference: In BSD all sockets connected to us get * ECONNRESET and we die on the spot. In Linux we behave * like files and pipes do and wait for the last * dereference. @@ -481,7 +481,6 @@ static int unix_listen(struct socket *sock, int backlog) struct sock *sk = sock->sk; struct unix_sock *u = unix_sk(sk); struct pid *old_pid = NULL; - const struct cred *old_cred = NULL; err = -EOPNOTSUPP; if (sock->type != SOCK_STREAM && sock->type != SOCK_SEQPACKET) @@ -503,8 +502,6 @@ static int unix_listen(struct socket *sock, int backlog) out_unlock: unix_state_unlock(sk); put_pid(old_pid); - if (old_cred) - put_cred(old_cred); out: return err; }