From d6a311d33098d5e4e18d103db64ede0323c16d3e Mon Sep 17 00:00:00 2001 From: shadow Date: Sat, 8 Nov 2008 16:02:36 +0000 Subject: [PATCH] don't panic on nfs reexport. Branch b1_8_gate b=16492 i=green i=johann --- lustre/mds/mds_reint.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c index 1a4ee4c..07b59ab 100644 --- a/lustre/mds/mds_reint.c +++ b/lustre/mds/mds_reint.c @@ -1662,11 +1662,6 @@ retry_locks: if (rc) GOTO(cleanup, rc); - if (!(*dchildp)->d_inode) - cleanup_phase = 3; /* parent lock */ - else - cleanup_phase = 4; /* child lock */ - /* Step 4: Re-lookup child to verify it hasn't changed since locking */ rc = mds_verify_child(obd, &parent_res_id, parent_lockh, *dparentp, parent_mode, &child_res_id, child_lockh, dchildp, @@ -1674,17 +1669,12 @@ retry_locks: if (rc > 0) goto retry_locks; if (rc < 0) { - cleanup_phase = 2; GOTO(cleanup, rc); } cleanup: if (rc) { switch (cleanup_phase) { - case 4: - ldlm_lock_decref(child_lockh, child_mode); - case 3: - ldlm_lock_decref(parent_lockh, parent_mode); case 2: l_dput(*dchildp); case 1: -- 1.8.3.1