X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_reint.c;h=c36ea7afa5d6dbc0aec1450bce104bac6c1f683a;hb=b58a81067237f398f735f85b2211431cfc37493a;hp=d0c072bcaa8cbc09faac580ee370454b92abf7ec;hpb=54fe9796ec837698a27420c8a92d9493c733b6a9;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c index d0c072b..c36ea7a 100644 --- a/lustre/mdt/mdt_reint.c +++ b/lustre/mdt/mdt_reint.c @@ -839,6 +839,7 @@ static int mdt_rename_lock(struct mdt_thread_info *info, struct ldlm_namespace *ns = info->mti_mdt->mdt_namespace; ldlm_policy_data_t *policy = &info->mti_policy; struct ldlm_res_id *res_id = &info->mti_res_id; + __u64 flags = 0; struct md_site *ms; int rc; ENTRY; @@ -850,7 +851,7 @@ static int mdt_rename_lock(struct mdt_thread_info *info, policy->l_inodebits.bits = MDS_INODELOCK_UPDATE; if (ms->ms_control_exp == NULL) { - int flags = LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB; + flags = LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB; /* * Current node is controller, that is mdt0, where we should @@ -864,8 +865,6 @@ static int mdt_rename_lock(struct mdt_thread_info *info, } else { struct ldlm_enqueue_info einfo = { LDLM_IBITS, LCK_EX, ldlm_blocking_ast, ldlm_completion_ast, NULL, NULL, NULL }; - int flags = 0; - /* * This is the case mdt0 is remote node, issue DLM lock like * other clients.