Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04dcd6e3 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Make setting a port number agostic 



We'll need to set the port number of an AF_INET or AF_INET6 address in
several places in fs/nfs/super.c, so introduce a helper that can manage
this for us.  We put this helper to immediate use.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent cdcd7f9a

fs/nfs/super.c

+24 −2
Original line number Diff line number Diff line
@@ -599,6 +599,25 @@ static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags) 
		rpc_killall_tasks(rpc);

}



/*

 * 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.

 *
@@ -629,6 +648,7 @@ static int nfs_parse_mount_options(char *raw, 
				   struct nfs_parsed_mount_data *mnt)

{

	char *p, *string;

	unsigned short port = 0;



	if (!raw) {

		dfprintk(MOUNT, "NFS: mount options string was NULL.\n");
@@ -731,7 +751,7 @@ static int nfs_parse_mount_options(char *raw, 
				return 0;

			if (option < 0 || option > 65535)

				return 0;

			mnt->nfs_server.address.sin_port = htons(option);

			port = option;

			break;

		case Opt_rsize:

			if (match_int(args, &mnt->rsize))
@@ -973,6 +993,8 @@ static int nfs_parse_mount_options(char *raw, 
		}

	}



	nfs_set_port((struct sockaddr *)&mnt->nfs_server.address, port);



	return 1;



out_nomem:
@@ -1023,7 +1045,7 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args, 
	/*

	 * autobind will be used if mount_server.port == 0

	 */

	sin.sin_port = htons(args->mount_server.port);

	nfs_set_port((struct sockaddr *)&sin, args->mount_server.port);



	/*

	 * Now ask the mount server to map our export path