Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202979
b: refs/heads/master
c: 6616f78
h: refs/heads/master
i:
  202977: 00e57ac
  202975: 24c292a
v: v3
  • Loading branch information
Eric W. Biederman authored and David S. Miller committed Jun 16, 2010
1 parent 26b4d93 commit 5f74d55
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7361c36c5224519b258219fe3d0e8abc865d8134
refs/heads/master: 6616f7888c6088324727363276f6de05a1dca6fc
7 changes: 2 additions & 5 deletions trunk/net/unix/af_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 5f74d55

Please sign in to comment.