From: Josef Sipek Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton --- net/socket.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff -puN net/socket.c~struct-path-convert-net net/socket.c --- a/net/socket.c~struct-path-convert-net +++ a/net/socket.c @@ -356,14 +356,14 @@ static int sock_attach_fd(struct socket this.name = name; this.hash = SOCK_INODE(sock)->i_ino; - file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this); - if (unlikely(!file->f_dentry)) + file->f_path.dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this); + if (unlikely(!file->f_path.dentry)) return -ENOMEM; - file->f_dentry->d_op = &sockfs_dentry_operations; - d_add(file->f_dentry, SOCK_INODE(sock)); - file->f_vfsmnt = mntget(sock_mnt); - file->f_mapping = file->f_dentry->d_inode->i_mapping; + file->f_path.dentry->d_op = &sockfs_dentry_operations; + d_add(file->f_path.dentry, SOCK_INODE(sock)); + file->f_path.mnt = mntget(sock_mnt); + file->f_mapping = file->f_path.dentry->d_inode->i_mapping; sock->file = file; file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops; @@ -401,7 +401,7 @@ static struct socket *sock_from_file(str if (file->f_op == &socket_file_ops) return file->private_data; /* set in sock_map_fd */ - inode = file->f_dentry->d_inode; + inode = file->f_path.dentry->d_inode; if (!S_ISSOCK(inode->i_mode)) { *err = -ENOTSOCK; return NULL; _