---

yaml --- r: 361839 b: refs/heads/master c: ded34e0 h: refs/heads/master i: 361837: 65239df 361835: bc16c48 361831: c85c5f9 361823: ab87829 v: v3
git-mirror · Mar 25, 2013 · 27a41d4 · 27a41d4
1 parent 05157b4
commit 27a41d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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)