X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosc%2Fosc_create.c;h=722cfc70b984345480816f835f4b3be973f98649;hp=a80cd1adf6f198f1a6cf9b3276ed4eba1f026491;hb=b92e914bd75cb62d34d7e42e8bf78864755106f2;hpb=b35c862e781d219adaf4e51be15ff5a4f3f5acdc

diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c
index a80cd1a..722cfc7 100644
--- a/lustre/osc/osc_create.c
+++ b/lustre/osc/osc_create.c
@@ -56,213 +56,21 @@
 #include <linux/obd_class.h>
 #include "osc_internal.h"
 
-static int osc_interpret_create(struct ptlrpc_request *req, void *data, int rc)
-{
-        struct osc_creator *oscc;
-        struct ost_body *body = NULL;
-        ENTRY;
-
-        if (req->rq_repmsg) {
-                body = lustre_swab_repbuf(req, 0, sizeof(*body),
-                                          lustre_swab_ost_body);
-                if (body == NULL && rc == 0)
-                        rc = -EPROTO;
-        }
-
-        oscc = req->rq_async_args.pointer_arg[0];
-        spin_lock(&oscc->oscc_lock);
-        oscc->oscc_flags &= ~OSCC_FLAG_CREATING;
-        if (rc == -ENOSPC || rc == -EROFS) {
-                oscc->oscc_flags |= OSCC_FLAG_NOSPC;
-                if (body && rc == -ENOSPC) {
-                        oscc->oscc_grow_count = OST_MIN_PRECREATE;
-                        oscc->oscc_last_id = body->oa.o_id;
-                }
-                spin_unlock(&oscc->oscc_lock);
-                DEBUG_REQ(D_INODE, req, "OST out of space, flagging");
-        } else if (rc != 0 && rc != -EIO) {
-                oscc->oscc_flags |= OSCC_FLAG_RECOVERING;
-                oscc->oscc_grow_count = OST_MIN_PRECREATE;
-                spin_unlock(&oscc->oscc_lock);
-                DEBUG_REQ(D_ERROR, req,
-                          "unknown rc %d from async create: failing oscc", rc);
-                ptlrpc_fail_import(req->rq_import, req->rq_import_generation);
-        } else {
-                if (rc == 0) {
-                        oscc->oscc_flags &= ~OSCC_FLAG_LOW;
-                        if (body) {
-                                int diff = body->oa.o_id - oscc->oscc_last_id;
-                                if (diff != oscc->oscc_grow_count)
-                                        oscc->oscc_grow_count =
-                                                max(diff/3, OST_MIN_PRECREATE);
-                                oscc->oscc_last_id = body->oa.o_id;
-                        }
-                }
-                spin_unlock(&oscc->oscc_lock);
-        }
-
-        CDEBUG(D_HA, "preallocated through id "LPU64" (last used "LPU64")\n",
-               oscc->oscc_last_id, oscc->oscc_next_id);
-
-        wake_up(&oscc->oscc_waitq);
-        RETURN(rc);
-}
-
-static int oscc_internal_create(struct osc_creator *oscc)
-{
-        struct ptlrpc_request *request;
-        struct ost_body *body;
-        int size = sizeof(*body);
-        ENTRY;
-
-        spin_lock(&oscc->oscc_lock);
-        if (oscc->oscc_grow_count < OST_MAX_PRECREATE &&
-            !(oscc->oscc_flags & (OSCC_FLAG_LOW | OSCC_FLAG_RECOVERING)) &&
-            (__s64)(oscc->oscc_last_id - oscc->oscc_next_id) <=
-                   (oscc->oscc_grow_count / 4 + 1)) {
-                oscc->oscc_flags |= OSCC_FLAG_LOW;
-                oscc->oscc_grow_count *= 2;
-        }
-
-        if (oscc->oscc_grow_count > OST_MAX_PRECREATE / 2)
-                oscc->oscc_grow_count = OST_MAX_PRECREATE / 2;
-
-        if (oscc->oscc_flags & OSCC_FLAG_CREATING ||
-            oscc->oscc_flags & OSCC_FLAG_RECOVERING) {
-                spin_unlock(&oscc->oscc_lock);
-                RETURN(0);
-        }
-        oscc->oscc_flags |= OSCC_FLAG_CREATING;
-        spin_unlock(&oscc->oscc_lock);
-
-        request = ptlrpc_prep_req(oscc->oscc_obd->u.cli.cl_import,
-                                  LUSTRE_OBD_VERSION, OST_CREATE,
-                                  1, &size, NULL);
-        if (request == NULL) {
-                spin_lock(&oscc->oscc_lock);
-                oscc->oscc_flags &= ~OSCC_FLAG_CREATING;
-                spin_unlock(&oscc->oscc_lock);
-                RETURN(-ENOMEM);
-        }
-
-        request->rq_request_portal = OST_CREATE_PORTAL; //XXX FIXME bug 249
-        body = lustre_msg_buf(request->rq_reqmsg, 0, sizeof(*body));
-
-        spin_lock(&oscc->oscc_lock);
-        body->oa.o_id = oscc->oscc_last_id + oscc->oscc_grow_count;
-        /* probably we should take frequence of request into account? -bzzz */
-        if (oscc->oscc_grow_count < oscc->oscc_max_grow_count) {
-                oscc->oscc_grow_count *= 2;
-                if (oscc->oscc_grow_count > oscc->oscc_max_grow_count)
-                        oscc->oscc_grow_count = oscc->oscc_max_grow_count;
-        }
-        body->oa.o_gr = oscc->oscc_gr;
-        LASSERT(body->oa.o_gr > 0);
-        body->oa.o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP;
-        spin_unlock(&oscc->oscc_lock);
-        CDEBUG(D_INFO, "preallocating through id "LPU64" (last used "LPU64")\n",
-               body->oa.o_id, oscc->oscc_next_id);
-
-        request->rq_replen = lustre_msg_size(1, &size);
-
-        request->rq_async_args.pointer_arg[0] = oscc;
-        request->rq_interpret_reply = osc_interpret_create;
-        ptlrpcd_add_req(request);
-
-        RETURN(0);
-}
-
-static int oscc_has_objects(struct osc_creator *oscc, int count)
-{
-        int have_objs;
-        spin_lock(&oscc->oscc_lock);
-        have_objs = ((__s64)(oscc->oscc_last_id - oscc->oscc_next_id) >= count);
-        spin_unlock(&oscc->oscc_lock);
-
-        if (!have_objs)
-                oscc_internal_create(oscc);
-
-        return have_objs;
-}
-
-static int oscc_wait_for_objects(struct osc_creator *oscc, int count)
-{
-        int have_objs;
-        int ost_full;
-        int osc_invalid;
-
-        have_objs = oscc_has_objects(oscc, count);
-
-        spin_lock(&oscc->oscc_lock);
-        ost_full = (oscc->oscc_flags & OSCC_FLAG_NOSPC);
-        spin_unlock(&oscc->oscc_lock);
-
-        osc_invalid = oscc->oscc_obd->u.cli.cl_import->imp_invalid;
-
-        return have_objs || ost_full || osc_invalid;
-}
-
-static int oscc_precreate(struct osc_creator *oscc, int wait)
-{
-        struct l_wait_info lwi = { 0 };
-        int rc = 0;
-        ENTRY;
-
-        if (oscc_has_objects(oscc, oscc->oscc_grow_count / 2))
-                RETURN(0);
-
-        if (!wait)
-                RETURN(0);
-
-        /* no rc check -- a no-INTR, no-TIMEOUT wait can't fail */
-        l_wait_event(oscc->oscc_waitq, oscc_wait_for_objects(oscc, 1), &lwi);
-
-        if (!oscc_has_objects(oscc, 1) && (oscc->oscc_flags & OSCC_FLAG_NOSPC))
-                rc = -ENOSPC;
-
-        if (oscc->oscc_obd->u.cli.cl_import->imp_invalid)
-                rc = -EIO;
-
-        RETURN(rc);
-}
-
-int oscc_recovering(struct osc_creator *oscc)
-{
-        int recov = 0;
-
-        spin_lock(&oscc->oscc_lock);
-        recov = oscc->oscc_flags & OSCC_FLAG_RECOVERING;
-        spin_unlock(&oscc->oscc_lock);
-
-        return recov;
-}
-
+/* this only is used now for deleting orphanes */
 int osc_create(struct obd_export *exp, struct obdo *oa,
-               void *acl, int acl_size,
-               struct lov_stripe_md **ea, struct obd_trans_info *oti)
+               void *acl, int acl_size, struct lov_stripe_md **ea,
+               struct obd_trans_info *oti)
 {
-        struct lov_stripe_md *lsm;
         struct osc_creator *oscc = &exp->exp_obd->u.cli.cl_oscc;
-        int try_again = 1, rc = 0;
+        int rc = 0;
         ENTRY;
+
         LASSERT(oa);
         LASSERT(ea);
-        LASSERT(oa->o_valid & OBD_MD_FLGROUP);
         LASSERT(oa->o_gr > 0);
+        LASSERT(oa->o_valid & OBD_MD_FLGROUP);
         LASSERT(acl == NULL && acl_size == 0);
 
-        if ((oa->o_valid & OBD_MD_FLFLAGS) &&
-            oa->o_flags == OBD_FL_RECREATE_OBJS) {
-                /* Exceptional case where we are trying to repair missing
-                 * objects for various groups.  We have already validated that
-                 * this is a valid group for the file.  Don't set oscc->oscc_gr.
-                 */
-                RETURN(osc_real_create(exp, oa, ea, oti));
-        }
-
-        LASSERT(oscc->oscc_gr == 0 || oscc->oscc_gr == oa->o_gr);
-        oscc->oscc_gr = oa->o_gr;
-
         if (oa->o_gr == FILTER_GROUP_LLOG || oa->o_gr == FILTER_GROUP_ECHO)
                 RETURN(osc_real_create(exp, oa, ea, oti));
 
@@ -284,10 +92,6 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
                        exp->exp_obd->obd_name);
                 LASSERT(oscc->oscc_flags & OSCC_FLAG_RECOVERING);
 
-                /* delete from next_id on up */
-                oa->o_valid |= OBD_MD_FLID;
-                oa->o_id = oscc->oscc_next_id - 1;
-
                 CDEBUG(D_HA, "%s: deleting to next_id: "LPU64"\n",
                        oscc->oscc_obd->obd_name, oa->o_id);
 
@@ -303,83 +107,18 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
                         if (rc == -ENOSPC)
                                 oscc->oscc_flags |= OSCC_FLAG_NOSPC;
                         oscc->oscc_flags &= ~OSCC_FLAG_RECOVERING;
-                        oscc->oscc_last_id = oa->o_id;
-                        
                         CDEBUG(D_HA, "%s: oscc recovery finished: %d\n",
                                oscc->oscc_obd->obd_name, rc);
-                        wake_up(&oscc->oscc_waitq);
-                        
                 } else {
                         CDEBUG(D_ERROR, "%s: oscc recovery failed: %d\n",
                                oscc->oscc_obd->obd_name, rc);
                 }
                 spin_unlock(&oscc->oscc_lock);
-
                 RETURN(rc);
         }
 
-        lsm = *ea;
-        if (lsm == NULL) {
-                rc = obd_alloc_memmd(exp, &lsm);
-                if (rc < 0)
-                        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_HA,"%p: timeout waiting on recovery\n",
-                                       oscc);
-                                RETURN(rc);
-                        }
-                        CDEBUG(D_HA, "%s: oscc recovery over, waking up\n",
-                               exp->exp_obd->obd_name);
-                }
-                
-                spin_lock(&oscc->oscc_lock);
-                if (oscc->oscc_flags & OSCC_FLAG_EXITING) {
-                        spin_unlock(&oscc->oscc_lock);
-                        break;
-                }
-
-                if (oscc->oscc_last_id >= oscc->oscc_next_id) {
-                        memcpy(oa, &oscc->oscc_oa, sizeof(*oa));
-                        oa->o_id = oscc->oscc_next_id;
-                        oa->o_gr = oscc->oscc_gr;
-                        lsm->lsm_object_id = oscc->oscc_next_id;
-                        lsm->lsm_object_gr = oscc->oscc_gr;
-                        *ea = lsm;
-                        oscc->oscc_next_id++;
-                        try_again = 0;
-                } else if (oscc->oscc_flags & OSCC_FLAG_NOSPC) {
-                        rc = -ENOSPC;
-                        spin_unlock(&oscc->oscc_lock);
-                        break;
-                }
-                spin_unlock(&oscc->oscc_lock);
-                rc = oscc_precreate(oscc, try_again);
-                if (rc)
-                        break;
-        }
-
-        if (rc == 0)
-                CDEBUG(D_HA, "%s: returning objid "LPU64"\n",
-                       oscc->oscc_obd->u.cli.cl_import->imp_target_uuid.uuid,
-                       lsm->lsm_object_id);
-        else if (*ea == NULL)
-                obd_free_memmd(exp, &lsm);
-        RETURN(rc);
+        LBUG();
+        RETURN(0);
 }
 
 void oscc_init(struct obd_device *obd)
@@ -390,19 +129,9 @@ void oscc_init(struct obd_device *obd)
                 return;
 
         oscc = &obd->u.cli.cl_oscc;
-
         memset(oscc, 0, sizeof(*oscc));
-        INIT_LIST_HEAD(&oscc->oscc_list);
-        init_waitqueue_head(&oscc->oscc_waitq);
-        spin_lock_init(&oscc->oscc_lock);
-        oscc->oscc_obd = obd;
-        oscc->oscc_kick_barrier = 100;
-        oscc->oscc_max_grow_count = 2000;
-        oscc->oscc_grow_count = OST_MIN_PRECREATE;
 
-        oscc->oscc_next_id = 2;
-        oscc->oscc_last_id = 1;
+        oscc->oscc_obd = obd;
+        spin_lock_init(&oscc->oscc_lock);
         oscc->oscc_flags |= OSCC_FLAG_RECOVERING;
-        /* XXX the export handle should give the oscc the last object */
-        /* oed->oed_oscc.oscc_last_id = exph->....; */
 }