--- fs/nfs/client.c

+++ fs/nfs/client.c

@@ -273,7 +273,7 @@ static int nfs_sockaddr_match_ipaddr6(co

sin1->sin6_scope_id != sin2->sin6_scope_id)

return 0;

- return ipv6_addr_equal(&sin1->sin6_addr, &sin1->sin6_addr);

+ return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);

}

#else /* !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE) */

static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1,

@@ -965,6 +965,8 @@ out_error:

static void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_server *source)

{

target->flags = source->flags;

+ target->rsize = source->rsize;

+ target->wsize = source->wsize;

target->acregmin = source->acregmin;

target->acregmax = source->acregmax;

target->acdirmin = source->acdirmin;

@@ -1283,7 +1285,8 @@ static int nfs4_init_server(struct nfs_s

/* Initialise the client representation from the mount data */

server->flags = data->flags;

- server->caps |= NFS_CAP_ATOMIC_OPEN|NFS_CAP_CHANGE_ATTR;

+ server->caps |= NFS_CAP_ATOMIC_OPEN|NFS_CAP_CHANGE_ATTR|

+ NFS_CAP_POSIX_LOCK;

server->options = data->options;

/* Get a client record */