From 12b6a5593a1d876ca1be91303da85a93ef6a92ca Mon Sep 17 00:00:00 2001 From: Andrew Perepechko Date: Fri, 22 Oct 2010 04:23:19 +0400 Subject: [PATCH] b=22386 disallow wrong conf_param options i=Johann Lombardi i=Nathan Rutman --- lustre/mgs/mgs_llog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c index 20469a8..223aeb1 100644 --- a/lustre/mgs/mgs_llog.c +++ b/lustre/mgs/mgs_llog.c @@ -2361,7 +2361,7 @@ static int mgs_write_log_param(struct obd_device *obd, struct fs_db *fsdb, struct lustre_cfg_bufs bufs; char *logname; char *tmp; - int rc = 0; + int rc = 0, rc2 = 0; ENTRY; /* For various parameter settings, we have to figure out which logs @@ -2614,12 +2614,13 @@ static int mgs_write_log_param(struct obd_device *obd, struct fs_db *fsdb, } LCONSOLE_WARN("Ignoring unrecognized param '%s'\n", ptr); + rc2 = -ENOSYS; end: if (rc) CERROR("err %d on param '%s'\n", rc, ptr); - RETURN(rc); + RETURN(rc ?: rc2); } /* Not implementing automatic failover nid addition at this time. */ -- 1.8.3.1