NFS: Replace nfs_set_port() with rpc_set_port()

Clean up.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index cf1da3e22004d49cc7a086f7b0e432c01e9e4cb6..c2f171a3d70e5d1bca3ff1f64dad2d826a1e1a79 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -368,22 +368,3 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len)
        return ((unsigned long)len + (unsigned long)base +
                PAGE_SIZE - 1) >> PAGE_SHIFT;
 }
-
-/*
- * Set the port number in an address.  Be agnostic about the address
- * family.
- */
-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:
-               ap->sin_port = htons(port);
-               break;
-       case AF_INET6:
-               ap6->sin6_port = htons(port);
-               break;
-       }
-}

diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 43c86b7556e1dfdb5254e543597bf44450aa93f9..ef22ee89aa77d76c0f1745ff461ec63aeba52fec 100644 (file)
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -125,7 +125,7 @@ static struct vfsmount *try_location(struct nfs_clone_mount *mountdata,
                                mountdata->addr, mountdata->addrlen);
                if (mountdata->addrlen == 0)
                        continue;
-               nfs_set_port(mountdata->addr, NFS_PORT);
+               rpc_set_port(mountdata->addr, NFS_PORT);
 
                memcpy(page2, buf->data, buf->len);
                page2[buf->len] = '\0';

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 1eeba8e538025e37d9c6a5c1b2af509178ae42d1..9c85cdb353aa6d5238fe24209460e38d71592f8d 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1409,7 +1409,7 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
        /*
         * autobind will be used if mount_server.port == 0
         */
-       nfs_set_port(request.sap, args->mount_server.port);
+       rpc_set_port(request.sap, args->mount_server.port);
 
        /*
         * Now ask the mount server to map our export path
@@ -1703,7 +1703,7 @@ static int nfs_validate_mount_data(void *options,
                                                &args->nfs_server.address))
                        goto out_no_address;
 
-               nfs_set_port((struct sockaddr *)&args->nfs_server.address,
+               rpc_set_port((struct sockaddr *)&args->nfs_server.address,
                                args->nfs_server.port);
 
                nfs_set_mount_transport_protocol(args);
@@ -2336,7 +2336,7 @@ static int nfs4_validate_mount_data(void *options,
                                                &args->nfs_server.address))
                        return -EINVAL;
 
-               nfs_set_port((struct sockaddr *)&args->nfs_server.address,
+               rpc_set_port((struct sockaddr *)&args->nfs_server.address,
                                args->nfs_server.port);
 
                nfs_validate_transport_protocol(args);