Commit d188262d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge commit '9f4c899c' into devel

parents f738f517 9f4c899c

fs/nfs/client.c

+39 −29
Original line number Original line Diff line number Diff line
@@ -255,6 +255,32 @@ static int nfs_sockaddr_match_ipaddr(const struct sockaddr *sa1, 
	}

	}

	return 0;

	return 0;

}

}



/*

 * Test if two ip6 socket addresses refer to the same socket by

 * comparing relevant fields. The padding bytes specifically, are not

 * compared. sin6_flowinfo is not compared because it only affects QoS

 * and sin6_scope_id is only compared if the address is "link local"

 * because "link local" addresses need only be unique to a specific

 * link. Conversely, ordinary unicast addresses might have different

 * sin6_scope_id.

 *

 * The caller should ensure both socket addresses are AF_INET6.

 */

static int nfs_sockaddr_cmp_ip6(const struct sockaddr *sa1,

				const struct sockaddr *sa2)

{

	const struct sockaddr_in6 *saddr1 = (const struct sockaddr_in6 *)sa1;

	const struct sockaddr_in6 *saddr2 = (const struct sockaddr_in6 *)sa2;



	if (!ipv6_addr_equal(&saddr1->sin6_addr,

			     &saddr1->sin6_addr))

		return 0;

	if (ipv6_addr_scope(&saddr1->sin6_addr) == IPV6_ADDR_SCOPE_LINKLOCAL &&

	    saddr1->sin6_scope_id != saddr2->sin6_scope_id)

		return 0;

	return saddr1->sin6_port == saddr2->sin6_port;

}

#else

#else

static int nfs_sockaddr_match_ipaddr4(const struct sockaddr_in *sa1,

static int nfs_sockaddr_match_ipaddr4(const struct sockaddr_in *sa1,

				 const struct sockaddr_in *sa2)

				 const struct sockaddr_in *sa2)
@@ -270,6 +296,12 @@ static int nfs_sockaddr_match_ipaddr(const struct sockaddr *sa1, 
	return nfs_sockaddr_match_ipaddr4((const struct sockaddr_in *)sa1,

	return nfs_sockaddr_match_ipaddr4((const struct sockaddr_in *)sa1,

			(const struct sockaddr_in *)sa2);

			(const struct sockaddr_in *)sa2);

}

}



static int nfs_sockaddr_cmp_ip6(const struct sockaddr * sa1,

				const struct sockaddr * sa2)

{

	return 0;

}

#endif

#endif





/*

/*
@@ -279,37 +311,17 @@ static int nfs_sockaddr_match_ipaddr(const struct sockaddr *sa1, 
 *

 *

 * The caller should ensure both socket addresses are AF_INET.

 * The caller should ensure both socket addresses are AF_INET.

 */

 */

static int nfs_sockaddr_cmp_ip4(const struct sockaddr_in * saddr1,

static int nfs_sockaddr_cmp_ip4(const struct sockaddr *sa1,

				const struct sockaddr_in * saddr2)

				const struct sockaddr *sa2)

{

{

	const struct sockaddr_in *saddr1 = (const struct sockaddr_in *)sa1;

	const struct sockaddr_in *saddr2 = (const struct sockaddr_in *)sa2;



	if (saddr1->sin_addr.s_addr != saddr2->sin_addr.s_addr)

	if (saddr1->sin_addr.s_addr != saddr2->sin_addr.s_addr)

		return 0;

		return 0;

	return saddr1->sin_port == saddr2->sin_port;

	return saddr1->sin_port == saddr2->sin_port;

}

}





/*

 * Test if two ip6 socket addresses refer to the same socket by

 * comparing relevant fields. The padding bytes specifically, are not

 * compared. sin6_flowinfo is not compared because it only affects QoS

 * and sin6_scope_id is only compared if the address is "link local"

 * because "link local" addresses need only be unique to a specific

 * link. Conversely, ordinary unicast addresses might have different

 * sin6_scope_id.

 *

 * The caller should ensure both socket addresses are AF_INET6.

 */

static int nfs_sockaddr_cmp_ip6 (const struct sockaddr_in6 * saddr1,

				 const struct sockaddr_in6 * saddr2)

{

	if (!ipv6_addr_equal(&saddr1->sin6_addr,

			     &saddr1->sin6_addr))

		return 0;

	if (ipv6_addr_scope(&saddr1->sin6_addr) == IPV6_ADDR_SCOPE_LINKLOCAL &&

	    saddr1->sin6_scope_id != saddr2->sin6_scope_id)

		return 0;

	return saddr1->sin6_port == saddr2->sin6_port;

}



/*

/*

 * Test if two socket addresses represent the same actual socket,

 * Test if two socket addresses represent the same actual socket,

 * by comparing (only) relevant fields.

 * by comparing (only) relevant fields.
@@ -322,11 +334,9 @@ static int nfs_sockaddr_cmp(const struct sockaddr *sa1, 




	switch (sa1->sa_family) {

	switch (sa1->sa_family) {

	case AF_INET:

	case AF_INET:

		return nfs_sockaddr_cmp_ip4((const struct sockaddr_in *) sa1,

		return nfs_sockaddr_cmp_ip4(sa1, sa2);

					    (const struct sockaddr_in *) sa2);

	case AF_INET6:

	case AF_INET6:

		return nfs_sockaddr_cmp_ip6((const struct sockaddr_in6 *) sa1,

		return nfs_sockaddr_cmp_ip6(sa1, sa2);

					    (const struct sockaddr_in6 *) sa2);

	}

	}

	return 0;

	return 0;

}

}