From: shadow <shadow>
Date: Sat, 8 Nov 2008 16:05:19 +0000 (+0000)
Subject: don't panic on nfs reexport.
X-Git-Tag: GIT_EPOCH_B_RELEASE_1_6_7~2^3~96
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9b34922a13e2ed8227e49d4855ebdd7e62a20e37;p=fs%2Flustre-release.git

don't panic on nfs reexport.

Branch b1_6
b=16492
i=green
i=johann
---

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index 29b23dc..a551be9 100644
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -1501,11 +1501,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,
@@ -1513,17 +1508,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: