diff options
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index eea75888805e..7c3323e8827b 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -718,14 +718,14 @@ static struct sock *unix_find_other(struct net *net, | |||
718 | goto put_fail; | 718 | goto put_fail; |
719 | 719 | ||
720 | err = -ECONNREFUSED; | 720 | err = -ECONNREFUSED; |
721 | if (!S_ISSOCK(nd.dentry->d_inode->i_mode)) | 721 | if (!S_ISSOCK(nd.path.dentry->d_inode->i_mode)) |
722 | goto put_fail; | 722 | goto put_fail; |
723 | u=unix_find_socket_byinode(net, nd.dentry->d_inode); | 723 | u = unix_find_socket_byinode(net, nd.path.dentry->d_inode); |
724 | if (!u) | 724 | if (!u) |
725 | goto put_fail; | 725 | goto put_fail; |
726 | 726 | ||
727 | if (u->sk_type == type) | 727 | if (u->sk_type == type) |
728 | touch_atime(nd.mnt, nd.dentry); | 728 | touch_atime(nd.path.mnt, nd.path.dentry); |
729 | 729 | ||
730 | path_release(&nd); | 730 | path_release(&nd); |
731 | 731 | ||
@@ -819,12 +819,12 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
819 | */ | 819 | */ |
820 | mode = S_IFSOCK | | 820 | mode = S_IFSOCK | |
821 | (SOCK_INODE(sock)->i_mode & ~current->fs->umask); | 821 | (SOCK_INODE(sock)->i_mode & ~current->fs->umask); |
822 | err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0); | 822 | err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0); |
823 | if (err) | 823 | if (err) |
824 | goto out_mknod_dput; | 824 | goto out_mknod_dput; |
825 | mutex_unlock(&nd.dentry->d_inode->i_mutex); | 825 | mutex_unlock(&nd.path.dentry->d_inode->i_mutex); |
826 | dput(nd.dentry); | 826 | dput(nd.path.dentry); |
827 | nd.dentry = dentry; | 827 | nd.path.dentry = dentry; |
828 | 828 | ||
829 | addr->hash = UNIX_HASH_SIZE; | 829 | addr->hash = UNIX_HASH_SIZE; |
830 | } | 830 | } |
@@ -842,8 +842,8 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
842 | list = &unix_socket_table[addr->hash]; | 842 | list = &unix_socket_table[addr->hash]; |
843 | } else { | 843 | } else { |
844 | list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; | 844 | list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; |
845 | u->dentry = nd.dentry; | 845 | u->dentry = nd.path.dentry; |
846 | u->mnt = nd.mnt; | 846 | u->mnt = nd.path.mnt; |
847 | } | 847 | } |
848 | 848 | ||
849 | err = 0; | 849 | err = 0; |
@@ -861,7 +861,7 @@ out: | |||
861 | out_mknod_dput: | 861 | out_mknod_dput: |
862 | dput(dentry); | 862 | dput(dentry); |
863 | out_mknod_unlock: | 863 | out_mknod_unlock: |
864 | mutex_unlock(&nd.dentry->d_inode->i_mutex); | 864 | mutex_unlock(&nd.path.dentry->d_inode->i_mutex); |
865 | path_release(&nd); | 865 | path_release(&nd); |
866 | out_mknod_parent: | 866 | out_mknod_parent: |
867 | if (err==-EEXIST) | 867 | if (err==-EEXIST) |