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-3095 build: fix 'memory corruption' errors
[fs/lustre-release.git]
/
lustre
/
osp
/
osp_md_object.c
diff --git
a/lustre/osp/osp_md_object.c
b/lustre/osp/osp_md_object.c
index
390000c
..
c3805f9
100644
(file)
--- a/
lustre/osp/osp_md_object.c
+++ b/
lustre/osp/osp_md_object.c
@@
-160,8
+160,8
@@
int osp_trans_stop(const struct lu_env *env, struct thandle *th)
{
int rc = 0;
- osp_destroy_update_req(th->th_current_request);
rc = th->th_current_request->ur_rc;
+ osp_destroy_update_req(th->th_current_request);
th->th_current_request = NULL;
return rc;
@@
-934,9
+934,11
@@
static void osp_it_put(const struct lu_env *env, struct dt_it *di)
static int osp_it_next(const struct lu_env *env, struct dt_it *di)
{
struct dt_object *dt = (struct dt_object *)di;
- struct osp_object *osp_obj = dt2osp_obj(dt);
- if (osp_obj->opo_empty)
+ struct osp_object *o = dt2osp_obj(dt);
+
+ if (o->opo_empty)
return 1;
+
return 0;
}