diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/lov/lov_object.c')
-rw-r--r-- | drivers/staging/lustre/lustre/lov/lov_object.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/staging/lustre/lustre/lov/lov_object.c b/drivers/staging/lustre/lustre/lov/lov_object.c index 992c80ab3d53..4cab730ab429 100644 --- a/drivers/staging/lustre/lustre/lov/lov_object.c +++ b/drivers/staging/lustre/lustre/lov/lov_object.c @@ -233,7 +233,7 @@ static int lov_init_raid0(const struct lu_env *env, result = ostid_to_fid(ofid, &oinfo->loi_oi, oinfo->loi_ost_idx); if (result != 0) - GOTO(out, result); + goto out; subdev = lovsub2cl_dev(dev->ld_target[ost_idx]); subconf->u.coc_oinfo = oinfo; @@ -747,7 +747,8 @@ static int lov_conf_set(const struct lu_env *env, struct cl_object *obj, lov_conf_lock(lov); if (conf->coc_opc == OBJECT_CONF_INVALIDATE) { lov->lo_layout_invalid = true; - GOTO(out, result = 0); + result = 0; + goto out; } if (conf->coc_opc == OBJECT_CONF_WAIT) { @@ -757,7 +758,7 @@ static int lov_conf_set(const struct lu_env *env, struct cl_object *obj, result = lov_layout_wait(env, lov); lov_conf_lock(lov); } - GOTO(out, result); + goto out; } LASSERT(conf->coc_opc == OBJECT_CONF_SET); @@ -770,13 +771,15 @@ static int lov_conf_set(const struct lu_env *env, struct cl_object *obj, (lov->lo_lsm->lsm_pattern == lsm->lsm_pattern))) { /* same version of layout */ lov->lo_layout_invalid = false; - GOTO(out, result = 0); + result = 0; + goto out; } /* will change layout - check if there still exists active IO. */ if (atomic_read(&lov->lo_active_ios) > 0) { lov->lo_layout_invalid = true; - GOTO(out, result = -EBUSY); + result = -EBUSY; + goto out; } lov->lo_layout_invalid = lov_layout_change(env, lov, conf); |