NFS: Cleanup nfs_set_port

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 5d2a5d3c424154c73703eb972b119da6b6d4976a..d212ee41caf21ce069f92784b229a7214859c58a 100644 (file)
--- a/fs/nfs/internal.h
+++ b/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;
        }
 }