X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftarget%2Ftgt_handler.c;h=ed8c0304149cc426ac1e2de26c5fb8ac0517191c;hb=3ad2eb7d456167d71bc4c0552e9a44af5e07fae9;hp=b3419ec6624b7a21f3c0f8c637c5ee9b3587172e;hpb=32dbb80b0dcf6774fcab1f4d79bfc119d27a25a2;p=fs%2Flustre-release.git diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c index b3419ec..ed8c030 100644 --- a/lustre/target/tgt_handler.c +++ b/lustre/target/tgt_handler.c @@ -1270,7 +1270,7 @@ static int tgt_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, rc = lu_env_init(&env, LCT_DT_THREAD); if (unlikely(rc != 0)) - RETURN(rc); + GOTO(err, rc); ost_fid_from_resid(&fid, &lock->l_resource->lr_name, tgt->lut_lsd.lsd_osd_index); @@ -1301,7 +1301,7 @@ err_put: err_env: lu_env_fini(&env); } - +err: rc = ldlm_server_blocking_ast(lock, desc, data, flag); RETURN(rc); }