From 4778a31bb8e9ec28ddb4767948b2248d13e7f2fa Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Mon, 11 Feb 2008 21:24:56 -0800
Subject: [PATCH] --- yaml --- r: 85638 b: refs/heads/master c:
 1105b5d1d44e6f00e31422dfcb0139bc8ae966a9 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/ax25/af_ax25.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index be33f07a1418..0086a9656815 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8315f5d80a90247bf92232f92ca49933ac49327b
+refs/heads/master: 1105b5d1d44e6f00e31422dfcb0139bc8ae966a9
diff --git a/trunk/net/ax25/af_ax25.c b/trunk/net/ax25/af_ax25.c
index 8fc64e3150a2..5a4337a29094 100644
--- a/trunk/net/ax25/af_ax25.c
+++ b/trunk/net/ax25/af_ax25.c
@@ -1928,12 +1928,10 @@ static int ax25_info_show(struct seq_file *seq, void *v)
 		   ax25->paclen);
 
 	if (ax25->sk != NULL) {
-		bh_lock_sock(ax25->sk);
-		seq_printf(seq," %d %d %ld\n",
+		seq_printf(seq, " %d %d %lu\n",
 			   atomic_read(&ax25->sk->sk_wmem_alloc),
 			   atomic_read(&ax25->sk->sk_rmem_alloc),
-			   ax25->sk->sk_socket != NULL ? SOCK_INODE(ax25->sk->sk_socket)->i_ino : 0L);
-		bh_unlock_sock(ax25->sk);
+			   sock_i_ino(ax25->sk));
 	} else {
 		seq_puts(seq, " * * *\n");
 	}