summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2008-08-20 16:10:22 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-10-07 18:17:36 -0400
commitf0c929251e01a7a86b6254c775cb6b65c6457f10 (patch)
tree18016ca1cffa8ab1bbe2c064bbf76bba443d8b78 /fs/nfs
parent460cdbc83268dd9641b57d893b03ef52fcc3f96d (diff)
downloadlinux-f0c929251e01a7a86b6254c775cb6b65c6457f10.tar.bz2
nfs: prepare to share nfs_set_port
We plan to use this function elsewhere. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/internal.h20
-rw-r--r--fs/nfs/super.c19
2 files changed, 20 insertions, 19 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 7bcf6ec2d458..8d91bd88e310 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -276,3 +276,23 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len)
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)
+{
+ 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;
+ }
+ }
+}
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 1e3558697219..b99096b8e827 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -675,25 +675,6 @@ static void nfs_umount_begin(struct super_block *sb)
}
/*
- * Set the port number in an address. Be agnostic about the address family.
- */
-static void nfs_set_port(struct sockaddr *sap, unsigned short port)
-{
- 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;
- }
- }
-}
-
-/*
* Sanity-check a server address provided by the mount command.
*
* Address family must be initialized, and address must not be