X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2Fllite_lib.c;h=e108220d89de017b4d3a8f8fb129aca2997bbde3;hb=94c6962ad22ff819fbf4a4bb7f412ac13cfeb4ca;hp=df524f1dd98a2c0ed53cfe7cd5f67bf23b960048;hpb=bf8dff47e1d1bf29d10572f84f888cad8a193a43;p=fs%2Flustre-release.git diff --git a/lustre/liblustre/llite_lib.c b/lustre/liblustre/llite_lib.c index df524f1..e108220 100644 --- a/lustre/liblustre/llite_lib.c +++ b/lustre/liblustre/llite_lib.c @@ -26,6 +26,8 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -36,21 +38,25 @@ * Lustre Light common routines */ +#include +#include #include #include -#include -#include -#include -#include -#include - +#include +#include +#include +#include #include -#include /* needed for parse_dump */ - -#include "lutil.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "llite_lib.h" - -int slp_global_init(void); +#include "lutil.h" static int lllib_init(void) { @@ -172,7 +178,7 @@ int liblustre_process_log(struct config_llog_instance *cfg, ctxt = llog_get_context(exp->exp_obd, LLOG_CONFIG_REPL_CTXT); cfg->cfg_flags |= CFG_F_COMPAT146; - rc = class_config_parse_llog(ctxt, profile, cfg); + rc = class_config_parse_llog(NULL, ctxt, profile, cfg); llog_ctxt_put(ctxt); if (rc) { CERROR("class_config_parse_llog failed: rc = %d\n", rc); @@ -266,7 +272,7 @@ int ll_parse_mount_target(const char *target, char **mgsnid, * to enable libsysio's processing of namespace init strings containing * lustre filesystem operations */ -int _sysio_lustre_init(void) +static int _sysio_lustre_init(void) { int err; char *envstr;