From: James Simmons <jsimmons@infradead.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>,
Oleg Drokin <oleg.drokin@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>,
Jian Yu <jian.yu@intel.com>,
James Simmons <jsimmons@infradead.org>
Subject: [PATCH 33/58] staging: lustre: obdclass: fix lmd_parse() to handle comma-separated NIDs
Date: Thu, 21 Jul 2016 22:44:26 -0400 [thread overview]
Message-ID: <1469155491-15265-34-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1469155491-15265-1-git-send-email-jsimmons@infradead.org>
From: Jian Yu <jian.yu@intel.com>
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: Jian 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: Niu Yawei <yawei.niu@intel.com>
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Reviewed-by: Sebastien Buisson <sebastien.buisson@bull.net>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/lustre/obdclass/obd_mount.c | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
index aa84a50..4931e37 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
@@ -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,
+ ¶m_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);
--
1.7.1
next prev parent reply other threads:[~2016-07-22 3:40 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-22 2:43 [PATCH 00/58] staging: lustre: bug fixes from lustre 2.5.[56-58] James Simmons
2016-07-22 2:43 ` [PATCH 01/58] staging: lustre: obd: expand op_cli_flags James Simmons
2016-07-22 2:43 ` [PATCH 02/58] staging: lustre: obd: rename struct lmv_stripe_md field mea to lmv James Simmons
2016-07-22 2:43 ` [PATCH 03/58] staging: lustre: ptlrpc: remove wirecheck for struct lmv_stripe_md James Simmons
2016-07-22 2:43 ` [PATCH 04/58] staging: lustre: llite: cache directory striping information James Simmons
2016-07-22 2:43 ` [PATCH 05/58] staging: lustre: lmv: add new lmv structures James Simmons
2016-07-22 2:43 ` [PATCH 06/58] staging: lustre: mdc: handle IT_READDIR operations James Simmons
2016-07-22 2:44 ` [PATCH 07/58] staging: lustre: llite: label the debug info James Simmons
2016-07-22 2:44 ` [PATCH 08/58] staging: lustre: llite: pass struct md_op_data to ll_dir_read James Simmons
2016-07-22 2:44 ` [PATCH 09/58] staging: lustre: llite: remove debug message in ll_dir_read James Simmons
2016-07-22 2:44 ` [PATCH 10/58] staging: lustre: llite: reduce indent " James Simmons
2016-07-22 2:44 ` [PATCH 11/58] staging: lustre: llite: set next only when needed " James Simmons
2016-07-22 2:44 ` [PATCH 12/58] staging: lustre: llite: handle done flags differently " James Simmons
2016-07-22 2:44 ` [PATCH 13/58] staging: lustre: llite: change done flag in ll_dir_read to bool James Simmons
2016-07-22 2:44 ` [PATCH 14/58] staging: lustre: llite: rename some variables for ll_dir_read James Simmons
2016-07-22 2:44 ` [PATCH 15/58] staging: lustre: llite: clarify some debug messages for statahead James Simmons
2016-07-22 2:44 ` [PATCH 16/58] staging: lustre: llite: remove code never called James Simmons
2016-07-22 2:44 ` [PATCH 17/58] staging: lustre: llite: pass in __u64 pos for ll_dir_read James Simmons
2016-07-22 2:44 ` [PATCH 18/58] staging: lustre: llite: do post work for statahead in readdir case James Simmons
2016-07-22 2:44 ` [PATCH 19/58] staging: lustre: llite: add md_op_data parameter to ll_get_dir_page James Simmons
2016-08-15 16:38 ` Greg Kroah-Hartman
2016-08-15 21:40 ` James Simmons
2016-08-16 10:51 ` Greg Kroah-Hartman
2016-07-22 2:44 ` [PATCH 20/58] staging: lustre: llite: remove comment from ll_dir_read James Simmons
2016-07-22 2:44 ` [PATCH 21/58] staging: lustre: llite: style cleanup for llite_internal.h James Simmons
2016-07-22 2:44 ` [PATCH 22/58] staging: lustre: llite: pass inode to ll_release_page James Simmons
2016-07-22 2:44 ` [PATCH 23/58] staging: lustre: llite: change remove parameter to bool James Simmons
2016-07-22 2:44 ` [PATCH 24/58] staging: lustre: mdc: don't take rpc lock for readdir case James Simmons
2016-07-22 2:44 ` [PATCH 25/58] staging: lustre: lmv: remove unused lmv_get_mea function James Simmons
2016-07-22 2:44 ` [PATCH 26/58] staging: lustre: lmv: remove duplicate MAX_HASH_* James Simmons
2016-07-22 2:44 ` [PATCH 27/58] staging: lustre: lmv: change handling of lmv striping information James Simmons
2016-07-22 2:44 ` [PATCH 28/58] staging: lustre: lmv: remove lmv_get_easize James Simmons
2016-07-22 2:44 ` [PATCH 29/58] staging: lustre: lmv: replace obd_free_memmd with lmv_free_memmd James Simmons
2016-07-22 2:44 ` [PATCH 30/58] staging: lustre: create striped directory James Simmons
2016-07-22 14:38 ` kbuild test robot
2016-07-26 16:36 ` [PATCH v2 " James Simmons
2016-07-26 16:59 ` Joe Perches
2016-07-26 18:09 ` James Simmons
2016-07-22 2:44 ` [PATCH 31/58] staging: lustre: llite: fix "getdirstripe" to show stripe info James Simmons
2016-07-22 2:44 ` [PATCH 32/58] staging: lustre: delete striped directory James Simmons
2016-07-22 2:44 ` James Simmons [this message]
2016-07-22 2:44 ` [PATCH 34/58] staging: lustre: obdclass: bug fixes for lu_device_type handling James Simmons
2016-07-22 2:44 ` [PATCH 35/58] staging: lustre: add ability to migrate inodes James Simmons
2016-07-22 2:44 ` [PATCH 36/58] staging: lustre: lmv: fix issue found by Klocwork Insight tool James Simmons
2016-07-22 2:44 ` [PATCH 37/58] staging: lustre: libcfs: Only dump log once per sec. to avoid EEXIST James Simmons
2016-07-22 2:44 ` [PATCH 38/58] staging: lustre: llite: enable clients to inject error for lfsck James Simmons
2016-07-22 2:44 ` [PATCH 39/58] staging: lustre: osc: allow to call brw_commit() multiple times James Simmons
2016-07-22 2:44 ` [PATCH 40/58] staging: lustre: llite: a few fixes for migration James Simmons
2016-07-22 2:44 ` [PATCH 41/58] staging: lustre: mdc: fixup MDS_SWAP_LAYOUTS ELC handling James Simmons
2016-07-22 2:44 ` [PATCH 42/58] staging: lustre: don't need to const __u64 parameters for lustre_idl.h James Simmons
2016-07-22 2:44 ` [PATCH 43/58] staging: lustre: const correct FID/OSTID/... helpers James Simmons
2016-07-22 2:44 ` [PATCH 44/58] staging: lustre: use bool for several function in lustre_idl.h/lustre_fid.h James Simmons
2016-07-22 2:44 ` [PATCH 45/58] staging: lustre: simplify inline functions in lustre_fid.h James Simmons
2016-07-22 2:44 ` [PATCH 46/58] staging: lustre: lmv: access lum_stripe_offset as little endian James Simmons
2016-07-22 2:44 ` [PATCH 47/58] staging: lustre: lmv: lookup remote migrating object in LMV James Simmons
2016-07-22 2:44 ` [PATCH 48/58] staging: lustre: lmv: Ensure lmv_intent_lookup cleans up reqp James Simmons
2016-07-22 2:44 ` [PATCH 49/58] staging: lustre: llite: avoid a deadlock in page write James Simmons
2016-07-22 2:44 ` [PATCH 50/58] staging: lustre: lov: handle the case of stripe size is not power 2 James Simmons
2016-07-22 2:44 ` [PATCH 51/58] staging: lustre: lmv: cleanup req in lmv_getattr_name() James Simmons
2016-07-22 2:44 ` [PATCH 52/58] staging: lustre: lmv: rename request to preq " James Simmons
2016-07-22 2:44 ` [PATCH 53/58] staging: lustre: obdclass: unified flow control interfaces James Simmons
2016-07-22 2:44 ` [PATCH 54/58] staging: lustre: reorder LOV_MAGIC_* definition James Simmons
2016-07-22 2:44 ` [PATCH 55/58] staging: lustre: ldlm: flock completion fixes James Simmons
2016-07-22 2:44 ` [PATCH 56/58] staging: lustre: move ioctls to lustre_ioctl.h James Simmons
2016-07-22 2:44 ` [PATCH 57/58] staging: lustre: llite: add error handler in inode prepare phase James Simmons
2016-07-22 2:44 ` [PATCH 58/58] staging: lustre: ptlrpc: Early replies need to honor at_max James Simmons
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469155491-15265-34-git-send-email-jsimmons@infradead.org \
--to=jsimmons@infradead.org \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=jian.yu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®