From: Andrew Morton Signed-off-by: Andrew Morton --- fs/nfs/super.c | 8 ++++---- net/sunrpc/xprtsock.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff -puN net/sunrpc/xprtsock.c~git-nfs-fixup net/sunrpc/xprtsock.c --- a/net/sunrpc/xprtsock.c~git-nfs-fixup +++ a/net/sunrpc/xprtsock.c @@ -1207,7 +1207,7 @@ static void xs_tcp_connect_worker(void * xprt->stat.connect_count++; xprt->stat.connect_start = jiffies; status = kernel_connect(sock, (struct sockaddr *) &xprt->addr, - sizeof(xprt->addr), O_NONBLOCK); + xprt->addrlen, O_NONBLOCK); dprintk("RPC: %p connect status %d connected %d sock state %d\n", xprt, -status, xprt_connected(xprt), sock->sk->sk_state); if (status < 0) { diff -puN fs/nfs/super.c~git-nfs-fixup fs/nfs/super.c --- a/fs/nfs/super.c~git-nfs-fixup +++ a/fs/nfs/super.c @@ -110,18 +110,18 @@ static struct file_system_type nfs4_fs_t .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA, }; -struct file_system_type clone_nfs4_fs_type = { +struct file_system_type nfs4_xdev_fs_type = { .owner = THIS_MODULE, .name = "nfs4", - .get_sb = nfs_clone_nfs4_sb, + .get_sb = nfs4_xdev_get_sb, .kill_sb = nfs4_kill_super, .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA, }; -struct file_system_type nfs_referral_nfs4_fs_type = { +struct file_system_type nfs4_referral_fs_type = { .owner = THIS_MODULE, .name = "nfs4", - .get_sb = nfs_referral_nfs4_sb, + .get_sb = nfs4_referral_get_sb, .kill_sb = nfs4_kill_super, .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA, }; _