Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-827 lov: Implement a per file data_version.
[fs/lustre-release.git]
/
lustre
/
mgc
/
libmgc.c
diff --git
a/lustre/mgc/libmgc.c
b/lustre/mgc/libmgc.c
index
3c242e3
..
9c2bb9b
100644
(file)
--- a/
lustre/mgc/libmgc.c
+++ b/
lustre/mgc/libmgc.c
@@
-26,8
+26,10
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-70,7
+72,7
@@
static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
/* liblustre only support null flavor to MGS */
obd->u.cli.cl_flvr_mgc.sf_rpc = SPTLRPC_FLVR_NULL;
/* liblustre only support null flavor to MGS */
obd->u.cli.cl_flvr_mgc.sf_rpc = SPTLRPC_FLVR_NULL;
- rc = obd_llog_init(obd, &obd->obd_olg, obd,
0, NULL,
NULL);
+ rc = obd_llog_init(obd, &obd->obd_olg, obd, NULL);
if (rc) {
CERROR("failed to setup llogging subsystems\n");
GOTO(err_cleanup, rc);
if (rc) {
CERROR("failed to setup llogging subsystems\n");
GOTO(err_cleanup, rc);
@@
-93,6
+95,7
@@
static int mgc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
switch (stage) {
case OBD_CLEANUP_EARLY:
case OBD_CLEANUP_EXPORTS:
switch (stage) {
case OBD_CLEANUP_EARLY:
case OBD_CLEANUP_EXPORTS:
+ obd_cleanup_client_import(obd);
rc = obd_llog_finish(obd, 0);
if (rc != 0)
CERROR("failed to cleanup llogging subsystems\n");
rc = obd_llog_finish(obd, 0);
if (rc != 0)
CERROR("failed to cleanup llogging subsystems\n");
@@
-116,8
+119,7
@@
static int mgc_cleanup(struct obd_device *obd)
}
static int mgc_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
}
static int mgc_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
- struct obd_device *tgt, int count,
- struct llog_catid *logid, struct obd_uuid *uuid)
+ struct obd_device *tgt, int *index)
{
struct llog_ctxt *ctxt;
int rc;
{
struct llog_ctxt *ctxt;
int rc;