b=17710

uncommit the patch for further investigation

i=Andreas

diff --git a/lustre/include/lustre_cfg.h b/lustre/include/lustre_cfg.h
index b6a9441..41ba95e 100644 (file)
--- a/lustre/include/lustre_cfg.h
+++ b/lustre/include/lustre_cfg.h
@@ -67,7 +67,6 @@ enum lcfg_command_type {
         LCFG_LOV_DEL_OBD        = 0x00cf00e,
         LCFG_PARAM              = 0x00cf00f,
         LCFG_MARKER             = 0x00cf010,
-        LCFG_SET_LDLM_TIMEOUT   = 0x00cf011,
         LCFG_LOG_START          = 0x00ce011,
         LCFG_LOG_END            = 0x00ce012,
         LCFG_LOV_ADD_INA        = 0x00ce013,

diff --git a/lustre/include/lustre_param.h b/lustre/include/lustre_param.h
index e8f6644..52b1d29 100644 (file)
--- a/lustre/include/lustre_param.h
+++ b/lustre/include/lustre_param.h
@@ -65,7 +65,6 @@ int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd,
 
 /* System global or special params not handled in obd's proc */
 #define PARAM_SYS_TIMEOUT          "sys.timeout="      /* global */
-#define PARAM_LDLM_TIMEOUT         "sys.ldlm_timeout=" /* global */
 #define PARAM_MGSNODE              "mgsnode="          /* during mount */
 #define PARAM_FAILNODE             "failover.node="    /* llog generation */
 #define PARAM_FAILMODE             "failover.mode="    /* llog generation */

diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index 2dd9df1..ae033a0 100644 (file)
--- a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -1484,24 +1484,6 @@ static int mgs_write_log_params(struct obd_device *obd, struct fs_db *fsdb,
                         goto end_while;
                 }
 
-                if (class_match_param(ptr, PARAM_LDLM_TIMEOUT, &tmp) == 0) {
-                        /* Change ldlm timeout */
-                        int timeout;
-                        timeout = simple_strtoul(tmp, NULL, 0);
-
-                        CDEBUG(D_MGS, "ldlm timeout %d\n", timeout);
-                        
-                        lustre_cfg_bufs_reset(&bufs, NULL);
-                        lcfg = lustre_cfg_new(LCFG_SET_LDLM_TIMEOUT, &bufs);
-                        lcfg->lcfg_num = timeout;
-                        /* modify all servers and clients */
-                        rc = mgs_write_log_direct_all(obd, fsdb, mti, lcfg,
-                                                      mti->mti_fsname,
-                                                      "ldlm_timeout"); 
-                        lustre_cfg_free(lcfg);
-                        goto end_while;
-                }
-
                 if (class_match_param(ptr, PARAM_OSC""PARAM_ACTIVE, &tmp) == 0){ 
                         /* active=0 means off, anything else means on */
                         int flag = (*tmp == '0') ? CM_EXCLUDE : 0;

diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c
index a589423..f60629f 100644 (file)
--- a/lustre/obdclass/obd_config.c
+++ b/lustre/obdclass/obd_config.c
@@ -801,20 +801,11 @@ int class_process_config(struct lustre_cfg *lcfg)
                 GOTO(out, err = 0);
         }
         case LCFG_SET_TIMEOUT: {
-                CDEBUG(D_IOCTL, "changing lustre obd_timeout from %d to %d\n",
+                CDEBUG(D_IOCTL, "changing lustre timeout from %d to %d\n",
                        obd_timeout, lcfg->lcfg_num);
                 obd_timeout = max(lcfg->lcfg_num, 1U);
                 GOTO(out, err = 0);
         }
-        case LCFG_SET_LDLM_TIMEOUT: {
-                CDEBUG(D_IOCTL, "changing lustre ldlm_timeout from %d to %d\n",
-                       ldlm_timeout, lcfg->lcfg_num);
-                ldlm_timeout = max(lcfg->lcfg_num, 1U);
-                if (ldlm_timeout > obd_timeout)
-                        ldlm_timeout = max(obd_timeout / 3, 1U);
-
-                GOTO(out, err = 0);
-        }
         case LCFG_SET_UPCALL: {
                 LCONSOLE_ERROR_MSG(0x15a, "recovery upcall is deprecated\n");
                 /* COMPAT_146 Don't fail on old configs */