From: James Simmons Date: Tue, 3 Nov 2020 14:27:43 +0000 (-0500) Subject: LU-9325 osd-ldisk: replace simple_strto* with kstr* functions X-Git-Tag: 2.14.51~146 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e520b6a7fa6b6dd3f703dc8c6918a3699b3d9517 LU-9325 osd-ldisk: replace simple_strto* with kstr* functions The parsing of mount parameters from the config llog is done in some cases with simple_strto* which is considered obsolete. Replace simple_strto* with the kstrto* equivalent functions. Change-Id: I7c26d14d02828c9f9a96f31a086a65bb39f3ea87 Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/40119 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Neil Brown Reviewed-by: Alex Zhuravlev Reviewed-by: Oleg Drokin --- diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c index 98b36a6..86054ff 100644 --- a/lustre/osd-ldiskfs/osd_handler.c +++ b/lustre/osd-ldiskfs/osd_handler.c @@ -7701,11 +7701,11 @@ static int osd_mount(const struct lu_env *env, const char *name = lustre_cfg_string(cfg, 0); const char *dev = lustre_cfg_string(cfg, 1); const char *opts; - unsigned long page, s_flags, lmd_flags = 0; + unsigned long page, s_flags = 0, lmd_flags = 0; struct page *__page; struct file_system_type *type; char *options = NULL; - char *str; + const char *str; struct osd_thread_info *info = osd_oti_get(env); struct lu_fid *fid = &info->oti_fid; struct inode *inode; @@ -7720,11 +7720,9 @@ static int osd_mount(const struct lu_env *env, RETURN(-E2BIG); strcpy(o->od_mntdev, dev); - str = lustre_cfg_string(cfg, 2); - s_flags = simple_strtoul(str, NULL, 0); - str = strstr(str, ":"); - if (str) - lmd_flags = simple_strtoul(str + 1, NULL, 0); + str = lustre_cfg_buf(cfg, 2); + sscanf(str, "%lu:%lu", &s_flags, &lmd_flags); + opts = lustre_cfg_string(cfg, 3); #ifdef __BIG_ENDIAN if (opts == NULL || strstr(opts, "bigendian_extents") == NULL) {