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

Commit c12bacec authored by Rob Landley's avatar Rob Landley Committed by Trond Myklebust
Browse files

cleanup: save 60 lines/100 bytes by combining two mostly duplicate functions. 



Eliminate two mostly duplicate functions (nfs_parse_simple_hostname()
and nfs_parse_protected_hostname()) and instead just make the calling
function (nfs_parse_devname()) do everything.

Signed-off-by: default avatarRob Landley <rlandley@parallels.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 7ec10f26

fs/nfs/super.c

+33 −96
Original line number Diff line number Diff line
@@ -1665,99 +1665,59 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args, 
	return nfs_walk_authlist(args, &request);

}



static int nfs_parse_simple_hostname(const char *dev_name,

/*

 * Split "dev_name" into "hostname:export_path".

 *

 * The leftmost colon demarks the split between the server's hostname

 * and the export path.  If the hostname starts with a left square

 * bracket, then it may contain colons.

 *

 * Note: caller frees hostname and export path, even on error.

 */

static int nfs_parse_devname(const char *dev_name,

			     char **hostname, size_t maxnamlen,

			     char **export_path, size_t maxpathlen)

{

	size_t len;

	char *colon, *comma;

	char *end;



	colon = strchr(dev_name, ':');

	if (colon == NULL)

	/* Is the host name protected with square brakcets? */

	if (*dev_name == '[') {

		end = strchr(++dev_name, ']');

		if (end == NULL || end[1] != ':')

			goto out_bad_devname;



	len = colon - dev_name;

	if (len > maxnamlen)

		goto out_hostname;



	/* N.B. caller will free nfs_server.hostname in all cases */

	*hostname = kstrndup(dev_name, len, GFP_KERNEL);

	if (!*hostname)

		goto out_nomem;

		len = end - dev_name;

		end++;

	} else {

		char *comma;



	/* kill possible hostname list: not supported */

	comma = strchr(*hostname, ',');

	if (comma != NULL) {

		if (comma == *hostname)

		end = strchr(dev_name, ':');

		if (end == NULL)

			goto out_bad_devname;

		*comma = '\0';

	}



	colon++;

	len = strlen(colon);

	if (len > maxpathlen)

		goto out_path;

	*export_path = kstrndup(colon, len, GFP_KERNEL);

	if (!*export_path)

		goto out_nomem;



	dfprintk(MOUNT, "NFS: MNTPATH: '%s'\n", *export_path);

	return 0;



out_bad_devname:

	dfprintk(MOUNT, "NFS: device name not in host:path format\n");

	return -EINVAL;



out_nomem:

	dfprintk(MOUNT, "NFS: not enough memory to parse device name\n");

	return -ENOMEM;



out_hostname:

	dfprintk(MOUNT, "NFS: server hostname too long\n");

	return -ENAMETOOLONG;

		len = end - dev_name;



out_path:

	dfprintk(MOUNT, "NFS: export pathname too long\n");

	return -ENAMETOOLONG;

		/* kill possible hostname list: not supported */

		comma = strchr(dev_name, ',');

		if (comma != NULL && comma < end)

			*comma = 0;

	}



/*

 * Hostname has square brackets around it because it contains one or

 * more colons.  We look for the first closing square bracket, and a

 * colon must follow it.

 */

static int nfs_parse_protected_hostname(const char *dev_name,

					char **hostname, size_t maxnamlen,

					char **export_path, size_t maxpathlen)

{

	size_t len;

	char *start, *end;



	start = (char *)(dev_name + 1);



	end = strchr(start, ']');

	if (end == NULL)

		goto out_bad_devname;

	if (*(end + 1) != ':')

		goto out_bad_devname;



	len = end - start;

	if (len > maxnamlen)

		goto out_hostname;



	/* N.B. caller will free nfs_server.hostname in all cases */

	*hostname = kstrndup(start, len, GFP_KERNEL);

	*hostname = kstrndup(dev_name, len, GFP_KERNEL);

	if (*hostname == NULL)

		goto out_nomem;



	end += 2;

	len = strlen(end);

	len = strlen(++end);

	if (len > maxpathlen)

		goto out_path;

	*export_path = kstrndup(end, len, GFP_KERNEL);

	if (!*export_path)

		goto out_nomem;



	dfprintk(MOUNT, "NFS: MNTPATH: '%s'\n", *export_path);

	return 0;



out_bad_devname:
@@ -1777,29 +1737,6 @@ static int nfs_parse_protected_hostname(const char *dev_name, 
	return -ENAMETOOLONG;

}



/*

 * Split "dev_name" into "hostname:export_path".

 *

 * The leftmost colon demarks the split between the server's hostname

 * and the export path.  If the hostname starts with a left square

 * bracket, then it may contain colons.

 *

 * Note: caller frees hostname and export path, even on error.

 */

static int nfs_parse_devname(const char *dev_name,

			     char **hostname, size_t maxnamlen,

			     char **export_path, size_t maxpathlen)

{

	if (*dev_name == '[')

		return nfs_parse_protected_hostname(dev_name,

						    hostname, maxnamlen,

						    export_path, maxpathlen);



	return nfs_parse_simple_hostname(dev_name,

					 hostname, maxnamlen,

					 export_path, maxpathlen);

}



/*

 * Validate the NFS2/NFS3 mount data

 * - fills in the mount root filehandle