From 0f67add39b81f28e86f1df2aaea830b250125a47 Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Mon, 17 Dec 2012 11:39:21 -0800 Subject: [PATCH] LU-709 build: remove old BGL support option Remove the old and obsolete --enable-bgl configure option. Lustre no longer supports the old kernel that BG/L systems use, and we do not use this opton on the later BG/P and BG/Q systems. Change-Id: Iea0b893fd67fe5242fa65ebc8993c1f2b0863ae6 Signed-off-by: Christopher J. Morrone Reviewed-on: http://review.whamcloud.com/4841 Tested-by: Hudson Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Yang Sheng --- build/autoconf/lustre-build.m4 | 23 ----------------------- libcfs/include/libcfs/libcfs_debug.h | 4 +--- lnet/klnds/socklnd/socklnd_modparams.c | 4 ---- lustre/include/lustre_dlm.h | 5 ----- lustre/llite/llite_lib.c | 4 ---- 5 files changed, 1 insertion(+), 39 deletions(-) diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4 index 754099e..c949dc1 100644 --- a/build/autoconf/lustre-build.m4 +++ b/build/autoconf/lustre-build.m4 @@ -286,28 +286,6 @@ AC_SUBST(LIBCFS_INCLUDE_DIR) ]) # -# LB_CONFIG_BGL -# -# Enable BGL features -# -AC_DEFUN([LB_CONFIG_BGL], -[AC_MSG_CHECKING([whether to build BGL features]) -AC_ARG_ENABLE([bgl], - AC_HELP_STRING([--enable-bgl], - [enable building of BGL features]), - [enable_bgl='yes'],[enable_bgl='no']) -AC_MSG_RESULT([$enable_bgl]) -if test x$enable_bgl != xno; then - AC_DEFINE(HAVE_BGL_SUPPORT, 1, Enable BGL Features) - enable_doc='no' - enable_tests='no' - enable_server='no' - enable_liblustre='no' - enable_libreadline='no' -fi -]) - -# # LB_PATH_SNMP # # check for in-tree snmp support @@ -610,7 +588,6 @@ LB_LIBCFS_DIR LB_INCLUDE_RULES -LB_CONFIG_BGL LB_PATH_DEFAULTS LB_PROG_CC diff --git a/libcfs/include/libcfs/libcfs_debug.h b/libcfs/include/libcfs/libcfs_debug.h index ff92659..0d1b713 100644 --- a/libcfs/include/libcfs/libcfs_debug.h +++ b/libcfs/include/libcfs/libcfs_debug.h @@ -383,9 +383,7 @@ extern int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob, extern int cfs_trace_copyout_string(char *usr_buffer, int usr_buffer_nob, const char *knl_buffer, char *append); -#if defined(HAVE_BGL_SUPPORT) -#define LIBCFS_DEBUG_FILE_PATH_DEFAULT "/bgl/ion/tmp/lustre-log" -#elif defined(__arch_um__) +#if defined(__arch_um__) #define LIBCFS_DEBUG_FILE_PATH_DEFAULT "/r/tmp/lustre-log" #elif defined(__WINNT__) #define LIBCFS_DEBUG_FILE_PATH_DEFAULT "\\SystemRoot\\temp\\lustre-log" diff --git a/lnet/klnds/socklnd/socklnd_modparams.c b/lnet/klnds/socklnd/socklnd_modparams.c index d36b5c9..2244c52 100644 --- a/lnet/klnds/socklnd/socklnd_modparams.c +++ b/lnet/klnds/socklnd/socklnd_modparams.c @@ -113,11 +113,7 @@ static int keepalive_idle = 30; CFS_MODULE_PARM(keepalive_idle, "i", int, 0644, "# idle seconds before probe"); -#ifdef HAVE_BGL_SUPPORT -#define DEFAULT_KEEPALIVE_COUNT 100 -#else #define DEFAULT_KEEPALIVE_COUNT 5 -#endif static int keepalive_count = DEFAULT_KEEPALIVE_COUNT; CFS_MODULE_PARM(keepalive_count, "i", int, 0644, "# missed probes == dead"); diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h index 5ad5f9b..689ba01 100644 --- a/lustre/include/lustre_dlm.h +++ b/lustre/include/lustre_dlm.h @@ -70,12 +70,7 @@ struct obd_device; #define OBD_LDLM_DEVICENAME "ldlm" -#ifdef HAVE_BGL_SUPPORT -/* 1.5 times the maximum 128 tasks available in VN mode */ -#define LDLM_DEFAULT_LRU_SIZE 196 -#else #define LDLM_DEFAULT_LRU_SIZE (100 * cfs_num_online_cpus()) -#endif #define LDLM_DEFAULT_MAX_ALIVE (cfs_time_seconds(36000)) #define LDLM_CTIME_AGE_LIMIT (10) #define LDLM_DEFAULT_PARALLEL_AST_LIMIT 1024 diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 4b0d300..dac77f0 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -94,11 +94,7 @@ static struct ll_sb_info *ll_init_sbi(void) si_meminfo(&si); pages = si.totalram - si.totalhigh; if (pages >> (20 - CFS_PAGE_SHIFT) < 512) { -#ifdef HAVE_BGL_SUPPORT - lru_page_max = pages / 4; -#else lru_page_max = pages / 2; -#endif } else { lru_page_max = (pages / 4) * 3; } -- 1.8.3.1