It would be nice if not necessary just to move nfs_set_port() somewhere
common and use that (maybe with a more generic name).
That aside, all 5 patches are OK by me.
--b.
On Fri, Aug 22, 2008 at 12:42:33PM -0400, Chuck Lever wrote:
> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> ---
>
> fs/lockd/host.c | 14 +++++++++++++-
> 1 files changed, 13 insertions(+), 1 deletions(-)
>
> diff --git a/fs/lockd/host.c b/fs/lockd/host.c
> index 55ef751..3f0c1a8 100644
> --- a/fs/lockd/host.c
> +++ b/fs/lockd/host.c
> @@ -39,6 +39,18 @@ static struct nsm_handle * nsm_find(const struct sockaddr_in *sin,
> const char *hostname,
> unsigned int hostname_len);
>
> +static void nlm_clear_port(struct sockaddr *sap)
> +{
> + switch (sap->sa_family) {
> + case AF_INET:
> + ((struct sockaddr_in *)sap)->sin_port = 0;
> + break;
> + case AF_INET6:
> + ((struct sockaddr_in6 *)sap)->sin6_port = 0;
> + break;
> + }
> +}
> +
> static void nlm_display_address(const struct sockaddr *sap,
> char *buf, const size_t len)
> {
> @@ -149,7 +161,7 @@ static struct nlm_host *nlm_lookup_host(int server,
> }
> host->h_name = nsm->sm_name;
> host->h_addr = *sin;
> - host->h_addr.sin_port = 0; /* ouch! */
> + nlm_clear_port((struct sockaddr *)&host->h_addr);
> host->h_saddr = *ssin;
> host->h_version = version;
> host->h_proto = proto;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
