From 27a41d41d624ae40f6251c9d37cf53ca1fde18a1 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Mon, 25 Mar 2013 03:18:33 +0000 Subject: [PATCH] --- yaml --- r: 361839 b: refs/heads/master c: ded34e0fe8fe8c2d595bfa30626654e4b87621e0 h: refs/heads/master i: 361837: 65239df90a4cf238889374fe30479aa50ca8f645 361835: bc16c48159bc646d809f80511e7b9317a4871676 361831: c85c5f9687bac710516bde0d55a4646ad1b32806 361823: ab87829aa0eedc7e452821ec7cf6c74a4caa4e26 v: v3 --- [refs] | 2 +- trunk/net/unix/af_unix.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 74a196450e29..ec077701bf08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ebe183c6d444ef5587d803b64a1f4734b18c564 +refs/heads/master: ded34e0fe8fe8c2d595bfa30626654e4b87621e0 diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c index 51be64f163ec..f153a8d6e339 100644 --- a/trunk/net/unix/af_unix.c +++ b/trunk/net/unix/af_unix.c @@ -382,7 +382,7 @@ static void unix_sock_destructor(struct sock *sk) #endif } -static int unix_release_sock(struct sock *sk, int embrion) +static void unix_release_sock(struct sock *sk, int embrion) { struct unix_sock *u = unix_sk(sk); struct path path; @@ -451,8 +451,6 @@ static int unix_release_sock(struct sock *sk, int embrion) if (unix_tot_inflight) unix_gc(); /* Garbage collect fds */ - - return 0; } static void init_peercred(struct sock *sk) @@ -699,9 +697,10 @@ static int unix_release(struct socket *sock) if (!sk) return 0; + unix_release_sock(sk, 0); sock->sk = NULL; - return unix_release_sock(sk, 0); + return 0; } static int unix_autobind(struct socket *sock)