From 5f74d55ae178cbd343f80e50fc019884b2f67f77 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Sun, 13 Jun 2010 03:35:48 +0000
Subject: [PATCH] --- yaml --- r: 202979 b: refs/heads/master c:
 6616f7888c6088324727363276f6de05a1dca6fc h: refs/heads/master i:   202977:
 00e57aca0c036d5f9949a9b475e020e3dcadd8be   202975:
 24c292aac978b198c6ec2d7ba3ee9b6f0e7c2707 v: v3

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

diff --git a/[refs] b/[refs]
index 41e92b9ed751..950a0c2545c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7361c36c5224519b258219fe3d0e8abc865d8134
+refs/heads/master: 6616f7888c6088324727363276f6de05a1dca6fc
diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
index 5fe9d6fe08b8..75ba48b0d12a 100644
--- a/trunk/net/unix/af_unix.c
+++ b/trunk/net/unix/af_unix.c
@@ -282,7 +282,7 @@ static inline struct sock *unix_find_socket_byname(struct net *net,
 	return s;
 }
 
-static struct sock *unix_find_socket_byinode(struct net *net, struct inode *i)
+static struct sock *unix_find_socket_byinode(struct inode *i)
 {
 	struct sock *s;
 	struct hlist_node *node;
@@ -292,9 +292,6 @@ static struct sock *unix_find_socket_byinode(struct net *net, struct inode *i)
 		    &unix_socket_table[i->i_ino & (UNIX_HASH_SIZE - 1)]) {
 		struct dentry *dentry = unix_sk(s)->dentry;
 
-		if (!net_eq(sock_net(s), net))
-			continue;
-
 		if (dentry && dentry->d_inode == i) {
 			sock_hold(s);
 			goto found;
@@ -758,7 +755,7 @@ static struct sock *unix_find_other(struct net *net,
 		err = -ECONNREFUSED;
 		if (!S_ISSOCK(inode->i_mode))
 			goto put_fail;
-		u = unix_find_socket_byinode(net, inode);
+		u = unix_find_socket_byinode(inode);
 		if (!u)
 			goto put_fail;