From d9d280ab35fd7415bbe7f6a0f75119a2ad507062 Mon Sep 17 00:00:00 2001 From: jxiong Date: Thu, 3 Dec 2009 03:28:30 +0000 Subject: [PATCH] b=16721 r=wangdi,tappro Use global rename lock at mdt to avoid deadlock --- lustre/mdt/mdt_reint.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c index 6548035..0939947 100644 --- a/lustre/mdt/mdt_reint.c +++ b/lustre/mdt/mdt_reint.c @@ -813,14 +813,6 @@ static int mdt_rename_lock(struct mdt_thread_info *info, int rc; ENTRY; - /* - * Disable global rename BFL lock temporarily because - * when a mds do rename recoverying, which might enqueue - * BFL lock to the controller mds. and this req might be - * replay req for controller mds. but we did not have - * such handling in controller mds. XXX - */ - RETURN(0); ms = mdt_md_site(info->mti_mdt); fid_build_reg_res_name(&LUSTRE_BFL_FID, res_id); @@ -858,9 +850,6 @@ static int mdt_rename_lock(struct mdt_thread_info *info, static void mdt_rename_unlock(struct lustre_handle *lh) { ENTRY; - /* Disable global rename BFL lock temporarily. see above XXX*/ - EXIT; - return; LASSERT(lustre_handle_is_used(lh)); ldlm_lock_decref(lh, LCK_EX); EXIT; -- 1.8.3.1