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

Commit f4ba0420 authored by Jian Yu's avatar Jian Yu Committed by Greg Kroah-Hartman
Browse files

staging: lustre: obdclass: fix lmd_parse() to handle comma-separated NIDs 



This patch handles the  upgrade situation that old mountdata already
contains comma-separated NIDs. The correct way to fix the original
issue is to parse comma-separated NIDs in lmd_parse().

Signed-off-by: default avatarJian Yu <jian.yu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4460
Reviewed-on: http://review.whamcloud.com/8918


Reviewed-by: default avatarNiu Yawei <yawei.niu@intel.com>
Reviewed-by: default avatarBobi Jam <bobijam@gmail.com>
Reviewed-by: default avatarSebastien Buisson <sebastien.buisson@bull.net>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75ac62fc

drivers/staging/lustre/lustre/obdclass/obd_mount.c

+16 −4
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ static int lmd_parse_mgs(struct lustre_mount_data *lmd, char **ptr) 
 */

static int lmd_parse(char *options, struct lustre_mount_data *lmd)

{

	char *s1, *s2, *devname = NULL;

	char *s1, *s2, *s3, *devname = NULL;

	struct lustre_mount_data *raw = (struct lustre_mount_data *)options;

	int rc = 0;
@@ -913,6 +913,7 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) 
		/* Skip whitespace and extra commas */

		while (*s1 == ' ' || *s1 == ',')

			s1++;

		s3 = s1;



		/* Client options are parsed in ll_options: eg. flock,

		 * user_xattr, acl
@@ -970,6 +971,7 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) 
			rc = lmd_parse_mgssec(lmd, s1 + 7);

			if (rc)

				goto invalid;

			s3 = s2;

			clear++;

		/* ost exclusion list */

		} else if (strncmp(s1, "exclude=", 8) == 0) {
@@ -990,10 +992,19 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) 
			size_t length, params_length;

			char *tail = strchr(s1 + 6, ',');



			if (!tail)

			if (!tail) {

				length = strlen(s1);

			else

				length = tail - s1;

			} else {

				lnet_nid_t nid;

				char *param_str = tail + 1;

				int supplementary = 1;



				while (!class_parse_nid_quiet(param_str, &nid,

							      &param_str)) {

					supplementary = 0;

				}

				length = param_str - s1 - supplementary;

			}

			length -= 6;

			params_length = strlen(lmd->lmd_params);

			if (params_length + length + 1 >= LMD_PARAMS_MAXLEN)
@@ -1001,6 +1012,7 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) 
			strncat(lmd->lmd_params, s1 + 6, length);

			lmd->lmd_params[params_length + length] = '\0';

			strlcat(lmd->lmd_params, " ", LMD_PARAMS_MAXLEN);

			s3 = s1 + 6 + length;

			clear++;

		} else if (strncmp(s1, "osd=", 4) == 0) {

			rc = lmd_parse_string(&lmd->lmd_osd_type, s1 + 4);