From 5d126531543d2e531a679f8230d52391aa257baa Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 26 Dec 2011 14:41:55 -0500
Subject: [PATCH] --- yaml --- r: 279080 b: refs/heads/master c:
 e09e9d189bc2d31dc365a3d846a09086317350b6 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/unix/diag.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index addd95e621c1..df02ce5b2ed1 100644
--- 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
index 39e44c98176a..c5bdbcb1c30b 100644
--- 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);