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-2147 quota: several fixes to reintegration procedure
[fs/lustre-release.git]
/
lustre
/
osp
/
osp_dev.c
diff --git
a/lustre/osp/osp_dev.c
b/lustre/osp/osp_dev.c
index
cf9ee4f
..
c9d9639
100644
(file)
--- a/
lustre/osp/osp_dev.c
+++ b/
lustre/osp/osp_dev.c
@@
-212,7
+212,7
@@
int osp_disconnect(struct osp_device *d)
(void)ptlrpc_pinger_del_import(imp);
rc = ptlrpc_disconnect_import(imp, 0);
(void)ptlrpc_pinger_del_import(imp);
rc = ptlrpc_disconnect_import(imp, 0);
- if (rc)
+ if (rc
&& rc != -ETIMEDOUT
)
CERROR("%s: can't disconnect: rc = %d\n",
d->opd_obd->obd_name, rc);
CERROR("%s: can't disconnect: rc = %d\n",
d->opd_obd->obd_name, rc);
@@
-584,6
+584,10
@@
static struct lu_device *osp_device_free(const struct lu_env *env,
ENTRY;
ENTRY;
+ if (cfs_atomic_read(&lu->ld_ref) && lu->ld_site) {
+ LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_ERROR, NULL);
+ lu_site_print(env, lu->ld_site, &msgdata, lu_cdebug_printer);
+ }
dt_device_fini(&m->opd_dt_dev);
OBD_FREE_PTR(m);
RETURN(NULL);
dt_device_fini(&m->opd_dt_dev);
OBD_FREE_PTR(m);
RETURN(NULL);
@@
-709,6
+713,10
@@
static int osp_obd_connect(const struct lu_env *env, struct obd_export **exp,
OBD_CONNECT_SKIP_ORPHAN |
OBD_CONNECT_VERSION |
OBD_CONNECT_FID;
OBD_CONNECT_SKIP_ORPHAN |
OBD_CONNECT_VERSION |
OBD_CONNECT_FID;
+
+ if (is_osp_on_ost(osp->opd_obd->obd_name))
+ ocd->ocd_connect_flags |= OBD_CONNECT_LIGHTWEIGHT;
+
ocd->ocd_version = LUSTRE_VERSION_CODE;
LASSERT(data->ocd_connect_flags & OBD_CONNECT_INDEX);
ocd->ocd_index = data->ocd_index;
ocd->ocd_version = LUSTRE_VERSION_CODE;
LASSERT(data->ocd_connect_flags & OBD_CONNECT_INDEX);
ocd->ocd_index = data->ocd_index;