Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging/lustre/obdclass: be more careful processing server name

Browse source 
Because whole options line gets passed to exclude processing, don't
search from end of passed in argument to determine fsname at
beginning.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2200
Lustre-change: http://review.whamcloud.com/6197
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nathaniel Clark 2013-07-23 00:07:00 +08:00 committed by Greg Kroah-Hartman
parent cdb5f7107f
commit f1b58c5afa
2 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/staging/lustre/lustre/obdclass/obd_config.c
View file

@ -1426,10 +1426,13 @@ int class_config_llog_handler(const struct lu_env *env,
} }
if ((clli->cfg_flags & CFG_F_EXCLUDE) && if (clli->cfg_flags & CFG_F_EXCLUDE) {
(lcfg->lcfg_command == LCFG_LOV_ADD_OBD)) CDEBUG(D_CONFIG, "cmd: %x marked EXCLUDED\n",
/* Add inactive instead */ lcfg->lcfg_command);
lcfg->lcfg_command = LCFG_LOV_ADD_INA; if (lcfg->lcfg_command == LCFG_LOV_ADD_OBD)
/* Add inactive instead */
lcfg->lcfg_command = LCFG_LOV_ADD_INA;
}
lustre_cfg_bufs_init(&bufs, lcfg); lustre_cfg_bufs_init(&bufs, lcfg);

58
drivers/staging/lustre/lustre/obdclass/obd_mount.c
View file

@ -650,6 +650,15 @@ int lustre_put_lsi(struct super_block *sb)
RETURN(0); RETURN(0);
} }
/*** SERVER NAME ***
* <FSNAME><SEPERATOR><TYPE><INDEX>
* FSNAME is between 1 and 8 characters (inclusive).
* Excluded characters are '/' and ':'
* SEPERATOR is either ':' or '-'
* TYPE: "OST", "MDT", etc.
* INDEX: Hex representation of the index
*/
/** Get the fsname ("lustre") from the server name ("lustre-OST003F"). /** Get the fsname ("lustre") from the server name ("lustre-OST003F").
* @param [in] svname server name including type and index * @param [in] svname server name including type and index
* @param [out] fsname Buffer to copy filesystem name prefix into. * @param [out] fsname Buffer to copy filesystem name prefix into.
@ -659,22 +668,13 @@ int lustre_put_lsi(struct super_block *sb)
*/ */
int server_name2fsname(const char *svname, char *fsname, const char **endptr) int server_name2fsname(const char *svname, char *fsname, const char **endptr)
{ {
const char *dash = strrchr(svname, '-'); const char *dash;
if (!dash) {
dash = strrchr(svname, ':');
if (!dash)
return -EINVAL;
}
/* interpret <fsname>-MDTXXXXX-mdc as mdt, the better way is to pass dash = svname + strnlen(svname, 8); /* max fsname length is 8 */
* in the fsname, then determine the server index */ for (; dash > svname && *dash != '-' && *dash != ':'; dash--)
if (!strcmp(LUSTRE_MDC_NAME, dash + 1)) { ;
dash--; if (dash == svname)
for (; dash > svname && *dash != '-' && *dash != ':'; dash--) return -EINVAL;
;
if (dash == svname)
return -EINVAL;
}
if (fsname != NULL) { if (fsname != NULL) {
strncpy(fsname, svname, dash - svname); strncpy(fsname, svname, dash - svname);
@ -697,15 +697,15 @@ int server_name2svname(const char *label, char *svname, const char **endptr,
size_t svsize) size_t svsize)
{ {
int rc; int rc;
const const char *dash; const char *dash;
/* We use server_name2fsname() just for parsing */ /* We use server_name2fsname() just for parsing */
rc = server_name2fsname(label, NULL, &dash); rc = server_name2fsname(label, NULL, &dash);
if (rc != 0) if (rc != 0)
return rc; return rc;
if (*dash != '-') if (endptr != NULL)
return -1; *endptr = dash;
if (strlcpy(svname, dash + 1, svsize) >= svsize) if (strlcpy(svname, dash + 1, svsize) >= svsize)
return -E2BIG; return -E2BIG;
@ -730,9 +730,6 @@ int server_name2index(const char *svname, __u32 *idx, const char **endptr)
if (rc != 0) if (rc != 0)
return rc; return rc;
if (*dash != '-')
return -EINVAL;
dash++; dash++;
if (strncmp(dash, "MDT", 3) == 0) if (strncmp(dash, "MDT", 3) == 0)
@ -744,11 +741,20 @@ int server_name2index(const char *svname, __u32 *idx, const char **endptr)
dash += 3; dash += 3;
if (strcmp(dash, "all") == 0) if (strncmp(dash, "all", 3) == 0) {
if (endptr != NULL)
*endptr = dash + 3;
return rc | LDD_F_SV_ALL; return rc | LDD_F_SV_ALL;
}
index = simple_strtoul(dash, (char **)endptr, 16); index = simple_strtoul(dash, (char **)endptr, 16);
*idx = index; if (idx != NULL)
*idx = index;
/* Account for -mdc after index that is possible when specifying mdt */
if (endptr != NULL && strncmp(LUSTRE_MDC_NAME, *endptr + 1,
sizeof(LUSTRE_MDC_NAME)-1) == 0)
*endptr += sizeof(LUSTRE_MDC_NAME);
return rc; return rc;
} }
@ -858,13 +864,15 @@ static int lmd_make_exclusion(struct lustre_mount_data *lmd, const char *ptr)
s1++; s1++;
rc = server_name2index(s1, &index, &s2); rc = server_name2index(s1, &index, &s2);
if (rc < 0) { if (rc < 0) {
CERROR("Can't parse server name '%s'\n", s1); CERROR("Can't parse server name '%s': rc = %d\n",
s1, rc);
break; break;
} }
if (rc == LDD_F_SV_TYPE_OST) if (rc == LDD_F_SV_TYPE_OST)
exclude_list[lmd->lmd_exclude_count++] = index; exclude_list[lmd->lmd_exclude_count++] = index;
else else
CDEBUG(D_MOUNT, "ignoring exclude %.7s\n", s1); CDEBUG(D_MOUNT, "ignoring exclude %.*s: type = %#x\n",
(uint)(s2-s1), s1, rc);
s1 = s2; s1 = s2;
/* now we are pointing at ':' (next exclude) /* now we are pointing at ':' (next exclude)
or ',' (end of excludes) */ or ',' (end of excludes) */