From: Andrew Perepechko <Andrew.Perepechko@Sun.COM>
Date: Thu, 20 May 2010 14:16:06 +0000 (+0400)
Subject: b=22386 more error handling for lctl conf_param
X-Git-Tag: v1_8_3_51~5
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=e94560b4dea12263975466474a62ec3522438f44;p=fs%2Flustre-release.git

b=22386 more error handling for lctl conf_param

make conf_param return error for unknown params

i=Nathan Rutman
i=Johann Lombardi
---

diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index 054748e..665831d 100644
--- a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -1449,7 +1449,7 @@ static int mgs_write_log_params(struct obd_device *obd, struct fs_db *fsdb,
         char *logname;
         char *ptr = mti->mti_params;
         char *endptr, *tmp;
-        int rc = 0;
+        int rc = 0, rc2 = 0;
         ENTRY;
 
         if (!mti->mti_params)
@@ -1649,6 +1649,7 @@ active_err:
                 }
 
                 LCONSOLE_WARN("Ignoring unrecognized param '%s'\n", ptr);
+                rc2 = -ENOSYS;
 
 end_while:
                 if (rc) {
@@ -1664,7 +1665,7 @@ end_while:
                 ptr = endptr + 1;
         }
 
-        RETURN(rc);
+        RETURN(rc ?: rc2);
 }
 
 int mgs_check_failnid(struct obd_device *obd, struct mgs_target_info *mti)