From 05931bf9b13b278770265cf475ebecee31b5598c Mon Sep 17 00:00:00 2001 From: nfshp Date: Fri, 4 Apr 2003 16:16:44 +0000 Subject: [PATCH] merge b_devel into b_cray --- lustre/include/linux/lustre_export.h | 3 +++ lustre/utils/lconf.in | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lustre/include/linux/lustre_export.h b/lustre/include/linux/lustre_export.h index 550a8d7..4a05728 100644 --- a/lustre/include/linux/lustre_export.h +++ b/lustre/include/linux/lustre_export.h @@ -34,6 +34,9 @@ struct obd_export { struct ptlrpc_connection *exp_connection; struct ldlm_export_data exp_ldlm_data; struct ptlrpc_request *exp_outstanding_reply; + time_t exp_last_request_time; + spinlock_t exp_lock; /* protects flags int below */ + int exp_failed:1; union { struct mds_export_data eu_mds_data; struct filter_export_data eu_filter_data; diff --git a/lustre/utils/lconf.in b/lustre/utils/lconf.in index 3c6ca73..082c927 100755 --- a/lustre/utils/lconf.in +++ b/lustre/utils/lconf.in @@ -1844,7 +1844,7 @@ lconf_options = [ ('dump', "Dump the kernel debug log to file before portals is unloaded", Lustre.Options.PARAM), ('minlevel', "Specify the minimum level of services to configure/cleanup", - Lustre.Options.PARAM, 0), + Lustre.Options.INTPARAM, 0), ('maxlevel', """Specify the maximum level of services to configure/cleanup Levels are aproximatly like: 10 - network @@ -1852,7 +1852,7 @@ lconf_options = [ 30 - osd, mdd 40 - mds, ost 70 - mountpoint, echo_client, osc, mdc, lov""", - Lustre.Options.PARAM, 100), + Lustre.Options.INTPARAM, 100), ('lustre', """Base directory of lustre sources. This parameter will cause lconf to load modules from a source tree.""", Lustre.Options.PARAM), -- 1.8.3.1