---

yaml --- r: 279080 b: refs/heads/master c: e09e9d1 h: refs/heads/master v: v3
git-mirror · Dec 26, 2011 · 5d12653 · 5d12653
1 parent ac1e567
commit 5d12653
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b0723c12e825e26aa5fc0c6970108425824b51d
+refs/heads/master: e09e9d189bc2d31dc365a3d846a09086317350b6
diff --git a/trunk/net/unix/diag.c b/trunk/net/unix/diag.c
@@ -86,8 +86,7 @@ static int sk_diag_dump_icons(struct sock *sk, struct sk_buff *nlskb)
 			 */
 			unix_state_lock_nested(req);
 			peer = unix_sk(req)->peer;
-			if (peer)
-				buf[i++] = sock_i_ino(peer);
+			buf[i++] = (peer ? sock_i_ino(peer) : 0);
 			unix_state_unlock(req);
 		}
 		spin_unlock(&sk->sk_receive_queue.lock);