diff options
| -rw-r--r-- | net/unix/af_unix.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 51be64f163ec..f153a8d6e339 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -382,7 +382,7 @@ static void unix_sock_destructor(struct sock *sk) | |||
| 382 | #endif | 382 | #endif |
| 383 | } | 383 | } |
| 384 | 384 | ||
| 385 | static int unix_release_sock(struct sock *sk, int embrion) | 385 | static void unix_release_sock(struct sock *sk, int embrion) |
| 386 | { | 386 | { |
| 387 | struct unix_sock *u = unix_sk(sk); | 387 | struct unix_sock *u = unix_sk(sk); |
| 388 | struct path path; | 388 | struct path path; |
| @@ -451,8 +451,6 @@ static int unix_release_sock(struct sock *sk, int embrion) | |||
| 451 | 451 | ||
| 452 | if (unix_tot_inflight) | 452 | if (unix_tot_inflight) |
| 453 | unix_gc(); /* Garbage collect fds */ | 453 | unix_gc(); /* Garbage collect fds */ |
| 454 | |||
| 455 | return 0; | ||
| 456 | } | 454 | } |
| 457 | 455 | ||
| 458 | static void init_peercred(struct sock *sk) | 456 | static void init_peercred(struct sock *sk) |
| @@ -699,9 +697,10 @@ static int unix_release(struct socket *sock) | |||
| 699 | if (!sk) | 697 | if (!sk) |
| 700 | return 0; | 698 | return 0; |
| 701 | 699 | ||
| 700 | unix_release_sock(sk, 0); | ||
| 702 | sock->sk = NULL; | 701 | sock->sk = NULL; |
| 703 | 702 | ||
| 704 | return unix_release_sock(sk, 0); | 703 | return 0; |
| 705 | } | 704 | } |
| 706 | 705 | ||
| 707 | static int unix_autobind(struct socket *sock) | 706 | static int unix_autobind(struct socket *sock) |
