From: shaver <shaver>
Date: Tue, 15 Oct 2002 19:05:27 +0000 (+0000)
Subject: Remove guaranteed-or-your-money-back deadlock from double taking of recovd_lock.
X-Git-Tag: 0.5.15~112
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=a60425b3f989fceb7f4f4c2e02af82ed6e92fbbf;p=fs%2Flustre-release.git

Remove guaranteed-or-your-money-back deadlock from double taking of recovd_lock.
(Sorry, phil.)
---

diff --git a/lustre/llite/super.c b/lustre/llite/super.c
index 08739a0..587895c 100644
--- a/lustre/llite/super.c
+++ b/lustre/llite/super.c
@@ -153,10 +153,8 @@ static struct super_block * ll_read_super(struct super_block *sb,
         mdc_conn = sbi2mdc(sbi)->cl_import.imp_connection;
         mdc_conn->c_level = LUSTRE_CONN_FULL;
         list_add(&mdc_conn->c_sb_chain, &sbi->ll_conn_chain);
-        spin_lock(&ptlrpc_recovd->recovd_lock);
         recovd_conn_manage(class_conn2export(&sbi->ll_mdc_conn)->exp_connection,
                            ptlrpc_recovd, ll_recover);
-        spin_unlock(&ptlrpc_recovd->recovd_lock);
 
         obd = class_uuid2obd(osc);
         if (!obd) {
@@ -169,10 +167,8 @@ static struct super_block * ll_read_super(struct super_block *sb,
                 CERROR("cannot connect to %s: rc = %d\n", osc, err);
                 GOTO(out_mdc, sb = NULL);
         }
-        spin_lock(&ptlrpc_recovd->recovd_lock);
         recovd_conn_manage(class_conn2export(&sbi->ll_osc_conn)->exp_connection,
                            ptlrpc_recovd, ll_recover);
-        spin_unlock(&ptlrpc_recovd->recovd_lock);
 
         /* XXX: need to store the last_* values somewhere */
         err = mdc_getstatus(&sbi->ll_mdc_conn, &rootfid, &last_committed,