From: alex <alex>
Date: Fri, 5 Aug 2005 22:09:12 +0000 (+0000)
Subject: - code duplicate we got during landing b_hd_crypto
X-Git-Tag: v1_7_100~993
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0f4403dd07bba8ab2358914e38773d85f775d158;p=fs%2Flustre-release.git

- code duplicate we got during landing b_hd_crypto
---

diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c
index 7596682..4202edc 100644
--- a/lustre/osc/osc_create.c
+++ b/lustre/osc/osc_create.c
@@ -128,49 +128,6 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
                 spin_unlock(&oscc->oscc_lock);
                 RETURN(rc);
         }
-        while (try_again) {
-                /* If orphans are being recovered, then we must wait until
-                   it is finished before we can continue with create. */
-                if (oscc_recovering(oscc)) {
-                        struct l_wait_info lwi;
-
-                        CDEBUG(D_HA,"%p: oscc recovery in progress, waiting\n",
-                               oscc);
-
-                        lwi = LWI_TIMEOUT(MAX(obd_timeout*HZ/4, 1), NULL, NULL);
-                        rc = l_wait_event(oscc->oscc_waitq,
-                                          !oscc_recovering(oscc), &lwi);
-                        LASSERT(rc == 0 || rc == -ETIMEDOUT);
-                        if (rc == -ETIMEDOUT) {
-                                CDEBUG(D_ERROR,"%p: timeout waiting on recovery\n",
-                                       oscc);
-                                RETURN(rc);
-                        }
-                        CDEBUG(D_HA, "%p: oscc recovery over, waking up\n",
-                               oscc);
-                }
-
-                spin_lock(&oscc->oscc_lock);
-                if (oscc->oscc_flags & OSCC_FLAG_EXITING) {
-                        spin_unlock(&oscc->oscc_lock);
-                        break;
-                }
-
-                if (oscc->oscc_flags & OSCC_FLAG_NOSPC) {
-                        rc = -ENOSPC;
-                        spin_unlock(&oscc->oscc_lock);
-                        break;
-                }
-
-                oscc->oscc_next_id++;
-                oa->o_id = oscc->oscc_next_id;
-                try_again = 0;
-                spin_unlock(&oscc->oscc_lock);
-
-                CDEBUG(D_HA, "%s: returning objid "LPU64"\n",
-                       oscc->oscc_obd->u.cli.cl_import->imp_target_uuid.uuid,
-                       oa->o_id);
-        }
 
         while (try_again) {
                 /* If orphans are being recovered, then we must wait until