From 9234d6be2b6075eb8292b9d011daa98a67093b76 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Wed, 8 Oct 2008 15:31:14 -0400 Subject: [PATCH] --- yaml --- r: 115406 b: refs/heads/master c: 456018d791ff4ef03d610f72486c637056bcd749 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/internal.h | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index af2091cd09fc..7af88b97d805 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03254e65a60d3113164672dbbadc023c4a56ecd1 +refs/heads/master: 456018d791ff4ef03d610f72486c637056bcd749 diff --git a/trunk/fs/nfs/internal.h b/trunk/fs/nfs/internal.h index 5d2a5d3c4241..d212ee41caf2 100644 --- a/trunk/fs/nfs/internal.h +++ b/trunk/fs/nfs/internal.h @@ -285,16 +285,15 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len) */ static inline void nfs_set_port(struct sockaddr *sap, unsigned short port) { + struct sockaddr_in *ap = (struct sockaddr_in *)sap; + struct sockaddr_in6 *ap6 = (struct sockaddr_in6 *)sap; + switch (sap->sa_family) { - case AF_INET: { - struct sockaddr_in *ap = (struct sockaddr_in *)sap; - ap->sin_port = htons(port); - break; - } - case AF_INET6: { - struct sockaddr_in6 *ap = (struct sockaddr_in6 *)sap; - ap->sin6_port = htons(port); - break; - } + case AF_INET: + ap->sin_port = htons(port); + break; + case AF_INET6: + ap6->sin6_port = htons(port); + break; } }