diff options
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 2358f2690ec5..310882fb698e 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -315,7 +315,7 @@ static struct sock *unix_find_socket_byinode(struct inode *i) | |||
315 | &unix_socket_table[i->i_ino & (UNIX_HASH_SIZE - 1)]) { | 315 | &unix_socket_table[i->i_ino & (UNIX_HASH_SIZE - 1)]) { |
316 | struct dentry *dentry = unix_sk(s)->path.dentry; | 316 | struct dentry *dentry = unix_sk(s)->path.dentry; |
317 | 317 | ||
318 | if (dentry && d_real_inode(dentry) == i) { | 318 | if (dentry && d_backing_inode(dentry) == i) { |
319 | sock_hold(s); | 319 | sock_hold(s); |
320 | goto found; | 320 | goto found; |
321 | } | 321 | } |
@@ -913,7 +913,7 @@ static struct sock *unix_find_other(struct net *net, | |||
913 | err = kern_path(sunname->sun_path, LOOKUP_FOLLOW, &path); | 913 | err = kern_path(sunname->sun_path, LOOKUP_FOLLOW, &path); |
914 | if (err) | 914 | if (err) |
915 | goto fail; | 915 | goto fail; |
916 | inode = d_real_inode(path.dentry); | 916 | inode = d_backing_inode(path.dentry); |
917 | err = inode_permission(inode, MAY_WRITE); | 917 | err = inode_permission(inode, MAY_WRITE); |
918 | if (err) | 918 | if (err) |
919 | goto put_fail; | 919 | goto put_fail; |
@@ -1040,7 +1040,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
1040 | goto out_up; | 1040 | goto out_up; |
1041 | } | 1041 | } |
1042 | addr->hash = UNIX_HASH_SIZE; | 1042 | addr->hash = UNIX_HASH_SIZE; |
1043 | hash = d_real_inode(path.dentry)->i_ino & (UNIX_HASH_SIZE - 1); | 1043 | hash = d_backing_inode(path.dentry)->i_ino & (UNIX_HASH_SIZE - 1); |
1044 | spin_lock(&unix_table_lock); | 1044 | spin_lock(&unix_table_lock); |
1045 | u->path = path; | 1045 | u->path = path; |
1046 | list = &unix_socket_table[hash]; | 1046 | list = &unix_socket_table[hash]; |
@@ -2113,8 +2113,8 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg, | |||
2113 | mutex_lock(&u->iolock); | 2113 | mutex_lock(&u->iolock); |
2114 | 2114 | ||
2115 | skip = sk_peek_offset(sk, flags); | 2115 | skip = sk_peek_offset(sk, flags); |
2116 | skb = __skb_try_recv_datagram(sk, flags, &peeked, &skip, &err, | 2116 | skb = __skb_try_recv_datagram(sk, flags, NULL, &peeked, &skip, |
2117 | &last); | 2117 | &err, &last); |
2118 | if (skb) | 2118 | if (skb) |
2119 | break; | 2119 | break; |
2120 | 2120 | ||