diff options
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 1752d6b10ac4..127656ebe7be 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -100,7 +100,7 @@ | |||
100 | #include <linux/in.h> | 100 | #include <linux/in.h> |
101 | #include <linux/fs.h> | 101 | #include <linux/fs.h> |
102 | #include <linux/slab.h> | 102 | #include <linux/slab.h> |
103 | #include <asm/uaccess.h> | 103 | #include <linux/uaccess.h> |
104 | #include <linux/skbuff.h> | 104 | #include <linux/skbuff.h> |
105 | #include <linux/netdevice.h> | 105 | #include <linux/netdevice.h> |
106 | #include <net/net_namespace.h> | 106 | #include <net/net_namespace.h> |
@@ -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]; |