Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327983
b: refs/heads/master
c: e04dae8
h: refs/heads/master
i:
  327981: a28adcd
  327979: afc89fa
  327975: ea26676
  327967: 5584619
v: v3
  • Loading branch information
Alan Cox authored and David S. Miller committed Sep 17, 2012
1 parent f4bcbb1 commit a341045
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e57b8bdb4833366fd23d03a066c7eb8acc5736c7
refs/heads/master: e04dae840883ca31cea01e5958c09eee005cf4de
5 changes: 1 addition & 4 deletions trunk/net/unix/af_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand All @@ -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;
}
Expand Down

0 comments on commit a341045

Please sign in to comment.