From: Nathaniel Clark <nathaniel.l.clark@intel.com>
Date: Thu, 30 Jun 2016 19:09:47 +0000 (-0400)
Subject: LU-7111 revert: b=22386 disallow wrong conf_param options
X-Git-Tag: 2.8.60~66
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=70d044e5b5947c885b084dd350fff62666b4b702;p=fs%2Flustre-release.git

LU-7111 revert: b=22386 disallow wrong conf_param options

Don't fail mount if there are unrecognized parameters.  They may
change or be retired over time.

This reverts commit 12b6a5593a1d876ca1be91303da85a93ef6a92ca.

Change-Id: I806fd2345b854c8464632125210f84c7a029b78d
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-on: http://review.whamcloud.com/21112
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Parinay Kondekar <parinay.kondekar@seagate.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index e307e16..a431b4d 100644
--- a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -3298,7 +3298,7 @@ static int mgs_write_log_param(const struct lu_env *env,
 	struct mgs_thread_info *mgi = mgs_env_info(env);
         char *logname;
         char *tmp;
-        int rc = 0, rc2 = 0;
+	int rc = 0;
         ENTRY;
 
         /* For various parameter settings, we have to figure out which logs
@@ -3713,13 +3713,12 @@ active_err:
 	}
 
         LCONSOLE_WARN("Ignoring unrecognized param '%s'\n", ptr);
-        rc2 = -ENOSYS;
 
 end:
         if (rc)
                 CERROR("err %d on param '%s'\n", rc, ptr);
 
-        RETURN(rc ?: rc2);
+	RETURN(rc);
 }
 
 int mgs_write_log_target(const struct lu_env *env, struct mgs_device *mgs,