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-10391 lnet: use large nids in struct lnet_event
[fs/lustre-release.git]
/
lustre
/
osp
/
osp_trans.c
diff --git
a/lustre/osp/osp_trans.c
b/lustre/osp/osp_trans.c
index
08022c3
..
ea42715
100644
(file)
--- a/
lustre/osp/osp_trans.c
+++ b/
lustre/osp/osp_trans.c
@@
-1117,12
+1117,13
@@
static int osp_send_update_req(const struct lu_env *env,
LASSERT(oth != NULL);
if (ou && ou->ou_generation != our->our_generation) {
LASSERT(oth != NULL);
if (ou && ou->ou_generation != our->our_generation) {
- const struct lnet_process
_id *peer =
- &osp->opd_obd->u.cli.cl_import->imp_connection->c_peer;
+ const struct lnet_process
id *peer;
+
rc = -ESTALE;
osp_trans_callback(env, oth, rc);
rc = -ESTALE;
osp_trans_callback(env, oth, rc);
+ peer = &osp->opd_obd->u.cli.cl_import->imp_connection->c_peer;
CDEBUG(D_HA, "%s: stale tx to %s: gen %llu != %llu: rc = %d\n",
CDEBUG(D_HA, "%s: stale tx to %s: gen %llu != %llu: rc = %d\n",
- osp->opd_obd->obd_name, libcfs_nid
2str(
peer->nid),
+ osp->opd_obd->obd_name, libcfs_nid
str(&
peer->nid),
osp->opd_update->ou_generation, our->our_generation, rc);
RETURN(rc);
}
osp->opd_update->ou_generation, our->our_generation, rc);
RETURN(rc);
}