LU-6245 libcfs: remove wrappers for timer functions

[fs/lustre-release.git] / lustre / obdclass / obd_mount_server.c

diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c
index 9945ef0..da64534 100644 (file)
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -407,6 +403,7 @@ int lustre_register_lwp_item(const char *lwpname, struct obd_export **exp,
 {
        struct obd_device        *lwp;
        struct lwp_register_item *lri;
+       bool cb = false;
        ENTRY;
 
        LASSERTF(strlen(lwpname) < MTI_NAME_MAXLEN, "lwpname is too long %s\n",
@@ -445,9 +442,11 @@ int lustre_register_lwp_item(const char *lwpname, struct obd_export **exp,
 
        spin_lock(&lwp_register_list_lock);
        list_add(&lri->lri_list, &lwp_register_list);
+       if (*exp != NULL)
+               cb = true;
        spin_unlock(&lwp_register_list_lock);
 
-       if (*exp != NULL && cb_func != NULL)
+       if (cb && cb_func != NULL)
                cb_func(cb_data);
        lustre_put_lwp_item(lri);
 
@@ -527,11 +526,12 @@ again:
                if (*lri->lri_exp != NULL)
                        continue;
                *lri->lri_exp = class_export_get(exp);
+               if (lri->lri_cb_func == NULL)
+                       continue;
                atomic_inc(&lri->lri_ref);
                spin_unlock(&lwp_register_list_lock);
 
-               if (lri->lri_cb_func != NULL)
-                       lri->lri_cb_func(lri->lri_cb_data);
+               lri->lri_cb_func(lri->lri_cb_data);
                lustre_put_lwp_item(lri);
 
                /* Others may have changed the list after we unlock, we have
@@ -781,7 +781,7 @@ static int client_lwp_config_process(const struct lu_env *env,
                                     struct llog_handle *handle,
                                     struct llog_rec_hdr *rec, void *data)
 {
-       struct config_llog_instance *clli = data;
+       struct config_llog_instance *cfg = data;
        int                          cfg_len = rec->lrh_len;
        char                        *cfg_buf = (char *) (rec + 1);
        struct lustre_cfg           *lcfg = NULL;
@@ -795,8 +795,9 @@ static int client_lwp_config_process(const struct lu_env *env,
                RETURN(-EINVAL);
        }
 
-       LASSERT(clli->cfg_sb != NULL);
-       lsi = s2lsi(clli->cfg_sb);
+       if (cfg->cfg_sb == NULL)
+               GOTO(out, rc = -EINVAL);
+       lsi = s2lsi(cfg->cfg_sb);
 
        lcfg = (struct lustre_cfg *)cfg_buf;
        if (lcfg->lcfg_version == __swab32(LUSTRE_CFG_VERSION)) {
@@ -818,35 +819,35 @@ static int client_lwp_config_process(const struct lu_env *env,
                    marker->cm_flags & CM_EXCLUDE)
                        GOTO(out, rc = 0);
 
-               if (!tgt_is_mdt(marker->cm_tgtname, &clli->cfg_lwp_idx))
+               if (!tgt_is_mdt(marker->cm_tgtname, &cfg->cfg_lwp_idx))
                        GOTO(out, rc = 0);
 
-               if (IS_MDT(lsi) && clli->cfg_lwp_idx != 0)
+               if (IS_MDT(lsi) && cfg->cfg_lwp_idx != 0)
                        GOTO(out, rc = 0);
 
                if (!strncmp(marker->cm_comment, "add mdc", 7) ||
                    !strncmp(marker->cm_comment, "add failnid", 11)) {
                        if (marker->cm_flags & CM_START) {
-                               clli->cfg_flags = CFG_F_MARKER;
+                               cfg->cfg_flags = CFG_F_MARKER;
                                /* This hack is to differentiate the
                                 * ADD_UUID is come from "add mdc" record
                                 * or from "add failnid" record. */
                                if (!strncmp(marker->cm_comment,
                                             "add failnid", 11))
-                                       clli->cfg_flags |= CFG_F_SKIP;
+                                       cfg->cfg_flags |= CFG_F_SKIP;
                        } else if (marker->cm_flags & CM_END) {
-                               clli->cfg_flags = 0;
+                               cfg->cfg_flags = 0;
                        }
                }
                break;
        }
        case LCFG_ADD_UUID: {
-               if (clli->cfg_flags == CFG_F_MARKER) {
-                       rc = lustre_lwp_setup(lcfg, lsi, clli->cfg_lwp_idx);
+               if (cfg->cfg_flags == CFG_F_MARKER) {
+                       rc = lustre_lwp_setup(lcfg, lsi, cfg->cfg_lwp_idx);
                        /* XXX: process only the first nid as
                         * we don't need another instance of lwp */
-                       clli->cfg_flags |= CFG_F_SKIP;
-               } else if (clli->cfg_flags == (CFG_F_MARKER | CFG_F_SKIP)) {
+                       cfg->cfg_flags |= CFG_F_SKIP;
+               } else if (cfg->cfg_flags == (CFG_F_MARKER | CFG_F_SKIP)) {
                        rc = class_add_uuid(lustre_cfg_string(lcfg, 1),
                                            lcfg->lcfg_nid);
                        if (rc)
@@ -1131,6 +1132,13 @@ static int server_lsi2mti(struct lustre_sb_info *lsi,
                }
        }
 
+       if (mti->mti_nid_count == 0) {
+               CERROR("Failed to get NID for server %s, please check whether "
+                      "the target is specifed with improper --servicenode or "
+                      "--network options.\n", mti->mti_svname);
+               RETURN(-EINVAL);
+       }
+
        mti->mti_lustre_ver = LUSTRE_VERSION_CODE;
        mti->mti_config_ver = 0;
 
@@ -1896,23 +1904,20 @@ void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd)
 
        if (has_ir) {
                int new_soft = soft;
-               int new_hard = hard;
 
                /* adjust timeout value by imperative recovery */
-
                new_soft = (soft * factor) / OBD_IR_FACTOR_MAX;
-               new_hard = (hard * factor) / OBD_IR_FACTOR_MAX;
-
                /* make sure the timeout is not too short */
                new_soft = max(min, new_soft);
-               new_hard = max(new_soft, new_hard);
 
                LCONSOLE_INFO("%s: Imperative Recovery enabled, recovery "
                              "window shrunk from %d-%d down to %d-%d\n",
-                             obd->obd_name, soft, hard, new_soft, new_hard);
+                             obd->obd_name, soft, hard, new_soft, hard);
 
                soft = new_soft;
-               hard = new_hard;
+       } else {
+               LCONSOLE_INFO("%s: Imperative Recovery not enabled, recovery "
+                             "window %d-%d\n", obd->obd_name, soft, hard);
        }
 
        /* we're done */