Branch: b_new_cmd

some fixes after mdd code inspection

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index 34f3af6..696f411 100644 (file)
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -64,14 +64,10 @@ static struct lu_object_operations mdd_lu_obj_ops;
 
 static struct lu_context_key       mdd_thread_key;
 
-struct mdd_thread_info {
-        struct txn_param mti_param;
-        struct lu_fid    mti_fid;
-};
 
 const char *mdd_root_dir_name = "ROOT";
 
-static struct mdd_thread_info *mdd_ctx_info(const struct lu_context *ctx)
+struct mdd_thread_info *mdd_ctx_info(const struct lu_context *ctx)
 {
         struct mdd_thread_info *info;
 
@@ -120,19 +116,16 @@ static int mdd_object_init(const struct lu_context *ctxt, struct lu_object *o)
 
 static void mdd_object_free(const struct lu_context *ctxt, struct lu_object *o)
 {
-       struct lu_object_header *h;
-        struct mdd_object *mdd = mdd_obj(o);
-
-       h = o->lo_header;
-       lu_object_fini(o);
+        struct mdd_object *mdd = lu2mdd_obj(o);
+       
+        lu_object_fini(o);
         OBD_FREE_PTR(mdd);
 }
 
-static int
-mdd_attr_get(const struct lu_context *ctxt,
-             struct md_object *obj, struct lu_attr *attr)
+static int mdd_attr_get(const struct lu_context *ctxt,
+                        struct md_object *obj, struct lu_attr *attr)
 {
-        struct mdd_object *mdd_obj = mdo2mddo(obj);
+        struct mdd_object *mdd_obj = md2mdd_obj(obj);
         struct dt_object  *next;
         int rc;
 
@@ -146,11 +139,10 @@ mdd_attr_get(const struct lu_context *ctxt,
         RETURN(rc);
 }
 
-static int
-mdd_xattr_get(const struct lu_context *ctxt, struct md_object *obj, void *buf,
-              int buf_len, const char *name)
+static int mdd_xattr_get(const struct lu_context *ctxt, struct md_object *obj,
+                         void *buf, int buf_len, const char *name)
 {
-        struct mdd_object *mdd_obj = mdo2mddo(obj);
+        struct mdd_object *mdd_obj = md2mdd_obj(obj);
         struct dt_object  *next;
         int rc;
 
@@ -164,9 +156,9 @@ mdd_xattr_get(const struct lu_context *ctxt, struct md_object *obj, void *buf,
         RETURN(rc);
 }
 
-static int
-__mdd_object_destroy(const struct lu_context *ctxt, struct mdd_object *obj,
-                     struct thandle *handle)
+static int __mdd_object_destroy(const struct lu_context *ctxt, 
+                                struct mdd_object *obj,
+                                struct thandle *handle)
 {
         struct dt_object  *next = mdd_object_child(obj);
         int rc = 0;
@@ -189,15 +181,13 @@ static int mdd_add_orphan(struct mdd_device *mdd, struct mdd_object *obj,
         RETURN(rc);
 }
 
-static int
-open_orphan(struct mdd_object *obj)
+static int open_orphan(struct mdd_object *obj)
 {
         return 0;
 }
 
-static int
-mdd_add_unlink_log(struct mdd_device *mdd, struct mdd_object *obj,
-                   struct thandle *handle)
+static int mdd_add_unlink_log(struct mdd_device *mdd, struct mdd_object *obj,
+                              struct thandle *handle)
 {
         return 0;
 }
@@ -260,32 +250,41 @@ static void mdd_txn_param_build(const struct lu_context *ctx,
         mdd_ctx_info(ctx)->mti_param.tp_credits = opd->mod_credits;
 }
 
-static int
-mdd_object_destroy(const struct lu_context *ctxt, struct md_object *obj)
+static void mdd_object_release(const struct lu_context *ctxt, 
+                              struct lu_object *lo)
 {
-        struct mdd_device *mdd = mdo2mdd(obj);
-        struct mdd_object *mdd_obj = mdo2mddo(obj);
+       struct mdd_device *mdd = lu2mdd_dev(lo->lo_dev);
+        struct mdd_object *mdd_obj = lu2mdd_obj(lo);
+        struct lu_attr *lu_attr = &mdd_ctx_info(ctxt)->mti_attr;
         struct thandle *handle;
-        int rc ;
+        int rc = 0;
         ENTRY;
 
-        mdd_txn_param_build(ctxt, &MDD_TXN_OBJECT_DESTROY);
-        handle = mdd_trans_start(ctxt, mdd);
-        if (IS_ERR(handle))
-                RETURN(PTR_ERR(handle));
+        rc = mdd_attr_get(ctxt, &mdd_obj->mod_obj, lu_attr);
+        if (rc < 0)
+                GOTO(out, rc);
 
-        mdd_lock(ctxt, mdd_obj, DT_WRITE_LOCK);
-        if (open_orphan(mdd_obj))
-                rc = mdd_add_orphan(mdd, mdd_obj, handle);
-        else {
-                rc = __mdd_object_destroy(ctxt, mdd_obj, handle);
-                if (rc == 0)
-                        rc = mdd_add_unlink_log(mdd, mdd_obj, handle);
-        }
+        if (lu_attr->la_nlink == 0) {
 
-        mdd_unlock(ctxt, mdd_obj, DT_WRITE_LOCK);
-        mdd_trans_stop(ctxt, mdd, handle);
-        RETURN(rc);
+                mdd_txn_param_build(ctxt, &MDD_TXN_OBJECT_CREATE);
+                handle = mdd_trans_start(ctxt, mdd);
+                if (IS_ERR(handle))
+                        GOTO(out, rc = PTR_ERR(handle));
+
+                if (open_orphan(mdd_obj))
+                        rc = mdd_add_orphan(mdd, mdd_obj, handle);
+                else {
+                        rc = __mdd_object_destroy(ctxt, mdd_obj, handle);
+                        if (rc == 0)
+                                rc = mdd_add_unlink_log(mdd, mdd_obj, handle);
+                }
+                mdd_trans_stop(ctxt, mdd, handle);
+        }
+out:
+        if (rc)
+                CERROR("release object error %d \n", rc);
+        EXIT;
+        return;
 }
 
 static int mdd_object_print(const struct lu_context *ctxt,
@@ -300,26 +299,12 @@ static int mdd_object_exists(const struct lu_context *ctx,
         return lu_object_exists(ctx, lu_object_next(o));
 }
 
-static int mdd_dt_lookup(const struct lu_context *ctx, struct mdd_object *obj,
-                         const char *name, struct lu_fid *fid)
-{
-        struct dt_object *dir    = mdd_object_child(obj);
-        struct dt_rec    *rec    = (struct dt_rec *)fid;
-        const struct dt_key *key = (const struct dt_key *)name;
-        int result;
-
-        if (dir->do_index_ops != NULL)
-                result = dir->do_index_ops->dio_lookup(ctx, dir, rec, key);
-        else
-                result = -ENOTDIR;
-        return result;
-}
-
 static int mdd_mount(const struct lu_context *ctx, struct mdd_device *mdd)
 {
         int result;
         struct dt_object *root;
-
+        ENTRY;
+        
         root = dt_store_open(ctx, mdd->mdd_child, mdd_root_dir_name,
                              &mdd->mdd_root_fid);
         if (!IS_ERR(root)) {
@@ -328,7 +313,7 @@ static int mdd_mount(const struct lu_context *ctx, struct mdd_device *mdd)
                 result = 0;
         } else
                 result = PTR_ERR(root);
-        return result;
+        RETURN(result);
 }
 
 static int mdd_fs_setup(const struct lu_context *ctx, struct mdd_device *mdd)
@@ -413,6 +398,7 @@ struct lu_device_operations mdd_lu_ops = {
 static struct lu_object_operations mdd_lu_obj_ops = {
        .loo_object_init    = mdd_object_init,
        .loo_object_free    = mdd_object_free,
+        .loo_object_release = mdd_object_release,
        .loo_object_print   = mdd_object_print,
        .loo_object_exists  = mdd_object_exists,
 };
@@ -467,9 +453,9 @@ static void mdd_trans_stop(const struct lu_context *ctxt,
         mdd_child_ops(mdd)->dt_trans_stop(ctxt, handle);
 }
 
-static int
-__mdd_object_create(const struct lu_context *ctxt, struct mdd_object *obj,
-                    struct lu_attr *attr, struct thandle *handle)
+static int __mdd_object_create(const struct lu_context *ctxt, 
+                               struct mdd_object *obj, struct lu_attr *attr, 
+                               struct thandle *handle)
 {
         struct dt_object *next;
         int rc = 0;
@@ -500,27 +486,25 @@ static int mdd_object_create(const struct lu_context *ctxt, struct md_object *ob
         if (IS_ERR(handle))
                 RETURN(PTR_ERR(handle));
 
-        rc = __mdd_object_create(ctxt, mdo2mddo(obj), attr, handle);
+        rc = __mdd_object_create(ctxt, md2mdd_obj(obj), attr, handle);
 
         mdd_trans_stop(ctxt, mdd, handle);
 
         RETURN(rc);
 }
 
-static int
-__mdd_attr_set(const struct lu_context *ctxt, struct md_object *obj,
-               const struct lu_attr *attr, struct thandle *handle)
+static int __mdd_attr_set(const struct lu_context *ctxt, struct md_object *obj,
+                          const struct lu_attr *attr, struct thandle *handle)
 {
         struct dt_object *next;
 
         LASSERT(lu_object_exists(ctxt, &obj->mo_lu));
-        next = mdd_object_child(mdo2mddo(obj));
+        next = mdd_object_child(md2mdd_obj(obj));
         return next->do_ops->do_attr_set(ctxt, next, attr, handle);
 }
 
-static int
-mdd_attr_set(const struct lu_context *ctxt,
-             struct md_object *obj, const struct lu_attr *attr)
+static int mdd_attr_set(const struct lu_context *ctxt,
+                        struct md_object *obj, const struct lu_attr *attr)
 {
         struct mdd_device *mdd = mdo2mdd(obj);
         struct thandle *handle;
@@ -530,7 +514,7 @@ mdd_attr_set(const struct lu_context *ctxt,
         mdd_txn_param_build(ctxt, &MDD_TXN_ATTR_SET);
         handle = mdd_trans_start(ctxt, mdd);
         if (!handle)
-                RETURN(-ENOMEM);
+                RETURN(PTR_ERR(handle));
 
         rc = __mdd_attr_set(ctxt, obj, attr, handle);
 
@@ -539,10 +523,9 @@ mdd_attr_set(const struct lu_context *ctxt,
         RETURN(rc);
 }
 
-static int
-__mdd_xattr_set(const struct lu_context *ctxt, struct mdd_device *mdd,
-                struct mdd_object *obj, const void *buf,
-                int buf_len, const char *name, struct thandle *handle)
+static int __mdd_xattr_set(const struct lu_context *ctxt,struct mdd_device *mdd,
+                           struct mdd_object *obj, const void *buf,
+                           int buf_len, const char *name,struct thandle *handle)
 {
         struct dt_object *next;
 
@@ -552,9 +535,8 @@ __mdd_xattr_set(const struct lu_context *ctxt, struct mdd_device *mdd,
                                           handle);
 }
 
-static int
-mdd_xattr_set(const struct lu_context *ctxt, struct md_object *obj, const void *buf,
-              int buf_len, const char *name)
+static int mdd_xattr_set(const struct lu_context *ctxt, struct md_object *obj, 
+                         const void *buf, int buf_len, const char *name)
 {
         struct mdd_device *mdd = mdo2mdd(obj);
         struct thandle *handle;
@@ -564,9 +546,9 @@ mdd_xattr_set(const struct lu_context *ctxt, struct md_object *obj, const void *
         mdd_txn_param_build(ctxt, &MDD_TXN_XATTR_SET);
         handle = mdd_trans_start(ctxt, mdd);
         if (!handle)
-                RETURN(-ENOMEM);
+                RETURN(PTR_ERR(handle));
 
-        rc = __mdd_xattr_set(ctxt, mdd, mdo2mddo(obj), buf, buf_len, name,
+        rc = __mdd_xattr_set(ctxt, mdd, md2mdd_obj(obj), buf, buf_len, name,
                              handle);
 
         mdd_trans_stop(ctxt, mdd, handle);
@@ -574,70 +556,44 @@ mdd_xattr_set(const struct lu_context *ctxt, struct md_object *obj, const void *
         RETURN(rc);
 }
 
-static const struct lu_fid *mdd_object_getfid(struct mdd_object *obj)
-{
-        return lu_object_fid(&obj->mod_obj.mo_lu);
-}
-
-static int
-__mdd_index_insert(const struct lu_context *ctxt, struct mdd_object *pobj,
-                   const struct lu_fid *lf, const char *name,
-                   struct thandle *handle)
-{
-        int rc;
-        struct dt_object *next = mdd_object_child(pobj);
-
-        rc = next->do_index_ops->dio_insert(ctxt, next, (struct dt_rec *)lf,
-                                            (struct dt_key *)name, handle);
-        return rc;
-}
-
-static int
-__mdd_index_delete(const struct lu_context *ctxt, struct mdd_device *mdd,
-                   struct mdd_object *pobj, const char *name,
-                   struct thandle *handle)
+static int __mdd_index_insert(const struct lu_context *ctxt, 
+                              struct mdd_object *pobj, const struct lu_fid *lf, 
+                              const char *name, struct thandle *handle)
 {
         int rc;
         struct dt_object *next = mdd_object_child(pobj);
         ENTRY;
-
-        rc = next->do_index_ops->dio_delete(ctxt, next,
-                                            (struct dt_key *)name, handle);
-
+        
+        if (next->do_index_ops != NULL)
+                rc = next->do_index_ops->dio_insert(ctxt, next, 
+                                         (struct dt_rec *)lf, 
+                                         (struct dt_key *)name, handle);
+        else
+                rc = -ENOTDIR;
         RETURN(rc);
 }
 
-/* XXX not used anywhere
-static int
-mdd_index_delete(const struct lu_context *ctxt, struct md_object *pobj,
-                 struct md_object *obj, const char *name)
+static int __mdd_index_delete(const struct lu_context *ctxt, 
+                              struct mdd_device *mdd, struct mdd_object *pobj, 
+                              const char *name, struct thandle *handle)
 {
-        struct mdd_object *mdd_pobj = mdo2mddo(pobj);
-        struct mdd_object *mdd_obj = mdo2mddo(obj);
-        struct mdd_device *mdd = mdo2mdd(obj);
-        struct thandle *handle;
         int rc;
+        struct dt_object *next = mdd_object_child(pobj);
         ENTRY;
 
-        mdd_txn_param_build(ctxt, &MDD_TXN_INDEX_DELETE);
-        handle = mdd_trans_start(ctxt, mdd);
-        if (IS_ERR(handle))
-                RETURN(PTR_ERR(handle));
-
-        rc = __mdd_index_delete(ctxt, mdd, mdd_pobj, name, handle);
-
-        mdd_trans_stop(ctxt, mdd, handle);
-
+        if (next->do_index_ops != NULL)
+                rc = next->do_index_ops->dio_delete(ctxt, next, 
+                                        (struct dt_key *)name, handle);
+        else
+                rc = -ENOTDIR;
         RETURN(rc);
 }
-*/
 
-static int
-mdd_link(const struct lu_context *ctxt, struct md_object *tgt_obj,
-         struct md_object *src_obj, const char *name)
+static int mdd_link(const struct lu_context *ctxt, struct md_object *tgt_obj,
+                    struct md_object *src_obj, const char *name)
 {
-        struct mdd_object *mdd_tobj = mdo2mddo(tgt_obj);
-        struct mdd_object *mdd_sobj = mdo2mddo(src_obj);
+        struct mdd_object *mdd_tobj = md2mdd_obj(tgt_obj);
+        struct mdd_object *mdd_sobj = md2mdd_obj(src_obj);
         struct mdd_device *mdd = mdo2mdd(src_obj);
         struct thandle *handle;
         int rc;
@@ -663,13 +619,12 @@ exit:
         RETURN(rc);
 }
 
-static int
-mdd_unlink(const struct lu_context *ctxt, struct md_object *pobj,
-           struct md_object *cobj, const char *name)
+static int mdd_unlink(const struct lu_context *ctxt, struct md_object *pobj,
+                      struct md_object *cobj, const char *name)
 {
         struct mdd_device *mdd = mdo2mdd(pobj);
-        struct mdd_object *mdd_pobj = mdo2mddo(pobj);
-        struct mdd_object *mdd_cobj = mdo2mddo(cobj);
+        struct mdd_object *mdd_pobj = md2mdd_obj(pobj);
+        struct mdd_object *mdd_cobj = md2mdd_obj(cobj);
         struct thandle *handle;
         int rc;
         ENTRY;
@@ -698,58 +653,64 @@ cleanup:
 static void mdd_rename_lock(struct mdd_device *mdd,
                             struct mdd_object *src_pobj,
                             struct mdd_object *tgt_pobj,
-                            /*struct mdd_object *sobj,*/
                             struct mdd_object *tobj)
 {
+        
         return;
 }
 
-static void mdd_rename_unlock(struct mdd_device *mdd, struct mdd_object *src_pobj,
-                              struct mdd_object *tgt_pobj/*, struct mdd_object *sobj*/,
+static void mdd_rename_unlock(struct mdd_device *mdd,
+                              struct mdd_object *src_pobj,
+                              struct mdd_object *tgt_pobj,
                               struct mdd_object *tobj)
 {
         return;
 }
 
-static int
-mdd_rename(const struct lu_context *ctxt, struct md_object *src_pobj,
-           struct md_object *tgt_pobj, const struct lu_fid *lf,
-           const char *sname, struct md_object *tobj, const char *tname)
+static int mdd_rename(const struct lu_context *ctxt, struct md_object *src_pobj,
+                      struct md_object *tgt_pobj, const struct lu_fid *lf,
+                      const char *sname, struct md_object *tobj, 
+                      const char *tname)
 {
         struct mdd_device *mdd = mdo2mdd(src_pobj);
-        struct mdd_object *mdd_spobj = mdo2mddo(src_pobj);
-        struct mdd_object *mdd_tpobj = mdo2mddo(tgt_pobj);
-        struct mdd_object *mdd_tobj = mdo2mddo(tobj);
-        int rc;
+        struct mdd_object *mdd_spobj = md2mdd_obj(src_pobj);
+        struct mdd_object *mdd_tpobj = md2mdd_obj(tgt_pobj);
+        struct mdd_object *mdd_tobj = NULL;
         struct thandle *handle;
+        int rc;
+        ENTRY;
 
         mdd_txn_param_build(ctxt, &MDD_TXN_RENAME);
         handle = mdd_trans_start(ctxt, mdd);
         if (IS_ERR(handle))
                 RETURN(PTR_ERR(handle));
 
-        mdd_rename_lock(mdd, mdd_spobj, mdd_tpobj, /*mdd_sobj, */ mdd_tobj);
+        if (tobj)
+                mdd_tobj = md2mdd_obj(tobj);
 
-        rc = __mdd_index_delete(ctxt, mdd, mdd_spobj, sname, handle);
-        if (rc)
-                GOTO(cleanup, rc);
+        mdd_rename_lock(mdd, mdd_spobj, mdd_tpobj, mdd_tobj);
 
-        rc = __mdd_index_delete(ctxt, mdd, mdd_tpobj, tname, handle);
+        rc = __mdd_index_delete(ctxt, mdd, mdd_spobj, sname, handle);
         if (rc)
                 GOTO(cleanup, rc);
+        if (tobj) {
+                rc = __mdd_index_delete(ctxt, mdd, mdd_tpobj, tname, handle);
+                if (rc)
+                        GOTO(cleanup, rc);
+        }
 
         rc = __mdd_index_insert(ctxt, mdd_tpobj, lf, tname, handle);
         if (rc)
                 GOTO(cleanup, rc);
 
-        if (lu_object_exists(ctxt, &tobj->mo_lu)) {
+        if (tobj && lu_object_exists(ctxt, &tobj->mo_lu)) {
                 rc = __mdd_object_destroy(ctxt, mdd_tobj, handle);
                 if (rc)
                         GOTO(cleanup, rc);
         }
 cleanup:
        /*FIXME: should we do error handling here?*/
-        mdd_rename_unlock(mdd, mdd_spobj, mdd_tpobj, /*mdd_sobj,*/ mdd_tobj);
+        mdd_rename_unlock(mdd, mdd_spobj, mdd_tpobj, mdd_tobj);
         mdd_trans_stop(ctxt, mdd, handle);
         RETURN(rc);
 }
@@ -757,7 +718,17 @@ cleanup:
 static int mdd_lookup(const struct lu_context *ctxt, struct md_object *pobj,
                       const char *name, struct lu_fid* fid)
 {
-        return mdd_dt_lookup(ctxt, mdo2mddo(pobj), name, fid);
+        struct dt_object *dir    = mdd_object_child(md2mdd_obj(pobj));
+        struct dt_rec    *rec    = (struct dt_rec *)fid;
+        const struct dt_key *key = (const struct dt_key *)name;
+        int result;
+        ENTRY;
+        
+        if (dir->do_index_ops != NULL)
+                result = dir->do_index_ops->dio_lookup(ctxt, dir, rec, key);
+        else
+                result = -ENOTDIR;
+        RETURN(result);
 }
 
 static int mdd_create(const struct lu_context *ctxt,
@@ -765,9 +736,9 @@ static int mdd_create(const struct lu_context *ctxt,
                       struct md_object *child, struct lu_attr* attr)
 {
         struct mdd_device *mdd = mdo2mdd(pobj);
-        struct mdd_object *mdo = mdo2mddo(pobj);
+        struct mdd_object *mdo = md2mdd_obj(pobj);
         struct thandle *handle;
-        int rc = 0, rc1, created = 0;
+        int rc = 0;
         ENTRY;
 
         mdd_txn_param_build(ctxt, &MDD_TXN_MKDIR);
@@ -777,29 +748,26 @@ static int mdd_create(const struct lu_context *ctxt,
 
         mdd_lock(ctxt, mdo, DT_WRITE_LOCK);
 
-        rc = __mdd_object_create(ctxt, mdo2mddo(child), attr, handle);
+        rc = __mdd_index_insert(ctxt, mdo, lu_object_fid(&child->mo_lu),
+                                name, handle);
         if (rc)
                 GOTO(cleanup, rc);
 
-        created = 1;
-        rc = __mdd_index_insert(ctxt, mdo, lu_object_fid(&child->mo_lu),
-                                name, handle);
+        rc = __mdd_object_create(ctxt, md2mdd_obj(child), attr, handle);
         if (rc)
                 GOTO(cleanup, rc);
-cleanup:
-        if (rc && created)
-               rc1 = __mdd_object_destroy(ctxt, mdo, handle);
 
+cleanup:
         mdd_unlock(ctxt, mdo, DT_WRITE_LOCK);
         mdd_trans_stop(ctxt, mdd, handle);
         RETURN(rc);
 }
 
 static int mdd_mkname(const struct lu_context *ctxt, struct md_object *pobj,
-          const char *name, const struct lu_fid *fid)
+                      const char *name, const struct lu_fid *fid)
 {
         struct mdd_device *mdd = mdo2mdd(pobj);
-        struct mdd_object *mdo = mdo2mddo(pobj);
+        struct mdd_object *mdo = md2mdd_obj(pobj);
         struct thandle *handle;
         int rc = 0;
         ENTRY;
@@ -840,20 +808,19 @@ static int mdd_statfs(const struct lu_context *ctx,
         RETURN(rc);
 }
 
-static int
-__mdd_ref_add(const struct lu_context *ctxt, struct mdd_object *obj,
-              struct thandle *handle)
+static int __mdd_ref_add(const struct lu_context *ctxt, struct mdd_object *obj,
+                         struct thandle *handle)
 {
         struct dt_object *next;
 
-        LASSERT(!lu_object_exists(ctxt, &obj->mod_obj.mo_lu));
+        LASSERT(lu_object_exists(ctxt, &obj->mod_obj.mo_lu));
         next = mdd_object_child(obj);
         return next->do_ops->do_object_ref_add(ctxt, next, handle);
 }
 
 static int mdd_ref_add(const struct lu_context *ctxt, struct md_object *obj)
 {
-        struct mdd_object *mdd_obj = mdo2mddo(obj);
+        struct mdd_object *mdd_obj = md2mdd_obj(obj);
         struct mdd_device *mdd = mdo2mdd(obj);
         struct thandle *handle;
         int  rc;
@@ -876,14 +843,14 @@ __mdd_ref_del(const struct lu_context *ctxt, struct mdd_object *obj,
 {
         struct dt_object *next;
 
-        LASSERT(!lu_object_exists(ctxt, &obj->mod_obj.mo_lu));
+        LASSERT(lu_object_exists(ctxt, &obj->mod_obj.mo_lu));
         next = mdd_object_child(obj);
         return next->do_ops->do_object_ref_del(ctxt, next, handle);
 }
 
 static int mdd_ref_del(const struct lu_context *ctxt, struct md_object *obj)
 {
-        struct mdd_object *mdd_obj = mdo2mddo(obj);
+        struct mdd_object *mdd_obj = md2mdd_obj(obj);
         struct mdd_device *mdd = mdo2mdd(obj);
         struct thandle *handle;
         int  rc;
@@ -1040,4 +1007,4 @@ MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Meta-data Device Prototype ("LUSTRE_MDD0_NAME")");
 MODULE_LICENSE("GPL");
 
-cfs_module(mdd, "0.0.2", mdd_mod_init, mdd_mod_exit);
+cfs_module(mdd, "0.1.0", mdd_mod_init, mdd_mod_exit);

diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h
index cec2f46..37c73d2 100644 (file)
--- a/lustre/mdd/mdd_internal.h
+++ b/lustre/mdd/mdd_internal.h
@@ -1,6 +1,29 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
+ *  mdd/mdd_internel.c
+ *
+ *  Copyright (C) 2006 Cluster File Systems, Inc.
+ *   Author: Wang Di <wangdi@clusterfs.com>
+ *
+ *   This file is part of the Lustre file system, http://www.lustre.org
+ *   Lustre is a trademark of Cluster File Systems, Inc.
+ *
+ *   You may have signed or agreed to another license before downloading
+ *   this software.  If so, you are bound by the terms and conditions
+ *   of that agreement, and the following does not apply to you.  See the
+ *   LICENSE file included with this distribution for more information.
+ *
+ *   If you did not agree to a different license, then this copy of Lustre
+ *   is open source software; you can redistribute it and/or modify it
+ *   under the terms of version 2 of the GNU General Public License as
+ *   published by the Free Software Foundation.
+ *
+ *   In either case, Lustre is distributed in the hope that it will be
+ *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   license text for more details.
  */
+
 #ifndef _MDD_INTERNAL_H
 #define _MDD_INTERNAL_H
 
@@ -8,10 +31,6 @@
 #include <md_object.h>
 
 struct dt_device;
-struct file;
-struct lr_server_data;
-struct dentry;
-struct llog_handle;
 
 struct mdd_lov_info {
         struct obd_device               *mdd_lov_obd; 
@@ -33,29 +52,20 @@ struct mdd_device {
         struct dt_device                 mdd_lov_dev; 
         int                              mdd_max_mdsize;
         int                              mdd_max_cookiesize;
-        struct file                     *mdd_rcvd_filp;
         struct lu_fid                    mdd_root_fid;
-        spinlock_t                       mdd_transno_lock;
-        __u64                            mdd_last_transno;
-        __u64                            mdd_mount_count;
-        __u64                            mdd_io_epoch;
-        unsigned long                    mdd_atime_diff;
-        struct lr_server_data           *mdd_server_data;
-        struct dentry                   *mdd_pending_dir;
-        struct dentry                   *mdd_logs_dir;
-        struct dentry                   *mdd_objects_dir;
-        struct llog_handle              *mdd_cfg_llh;
-        struct file                     *mdd_health_check_filp;
-        struct semaphore                 mdd_health_sem;
-        unsigned long                    mdd_lov_objids_valid:1,
-                                         mdd_fl_user_xattr:1,
-                                         mdd_fl_acl:1;
 };
 
 struct mdd_object {
         struct md_object  mod_obj;
 };
 
+struct mdd_thread_info {
+        struct txn_param mti_param;
+        struct lu_fid    mti_fid;
+        struct lu_attr   mti_attr;
+        struct lov_desc  mti_ld;
+};
+
 int mdd_lov_init(const struct lu_context *ctxt, struct mdd_device *mdd,
                  struct lustre_cfg *cfg);
 int mdd_lov_fini(const struct lu_context *ctxt, struct mdd_device *mdd);
@@ -63,6 +73,7 @@ int mdd_notify(const struct lu_context *ctxt, struct lu_device *ld,
                struct obd_device *watched, enum obd_notify_event ev,
                void *data);
 
+struct mdd_thread_info *mdd_ctx_info(const struct lu_context *ctx);
 extern struct lu_device_operations mdd_lu_ops;
 static inline int lu_device_is_mdd(struct lu_device *d)
 {
@@ -83,7 +94,7 @@ static inline struct lu_device *mdd2lu_dev(struct mdd_device *d)
        return (&d->mdd_md_dev.md_lu_dev);
 }
 
-static inline struct mdd_object *mdd_obj(struct lu_object *o)
+static inline struct mdd_object *lu2mdd_obj(struct lu_object *o)
 {
        LASSERT(lu_device_is_mdd(o->lo_dev));
        return container_of0(o, struct mdd_object, mod_obj.mo_lu);
@@ -94,7 +105,7 @@ static inline struct mdd_device* mdo2mdd(struct md_object *mdo)
         return lu2mdd_dev(mdo->mo_lu.lo_dev);
 }
 
-static inline struct mdd_object* mdo2mddo(struct md_object *mdo)
+static inline struct mdd_object* md2mdd_obj(struct md_object *mdo)
 {
         return container_of0(mdo, struct mdd_object, mod_obj);
 }

diff --git a/lustre/mdd/mdd_lov.c b/lustre/mdd/mdd_lov.c
index 9b6dc78..4b9fd22 100644 (file)
--- a/lustre/mdd/mdd_lov.c
+++ b/lustre/mdd/mdd_lov.c
@@ -53,7 +53,7 @@ static int mdd_lov_read_objids(const struct lu_context *ctxt,
 {
         struct mdd_lov_info *lov_info = &mdd->mdd_lov_info;
         struct dt_object *obj_ids = lov_info->mdd_lov_objid_obj;
-        struct lu_attr *lu_attr = NULL;
+        struct lu_attr *lu_attr = &mdd_ctx_info(ctxt)->mti_attr;
         obd_id *ids;
         int i, rc;
         ENTRY;
@@ -64,14 +64,11 @@ static int mdd_lov_read_objids(const struct lu_context *ctxt,
         /* Read everything in the file, even if our current lov desc 
            has fewer targets. Old targets not in the lov descriptor 
            during mds setup may still have valid objids. */
-        OBD_ALLOC_PTR(lu_attr);
-        if (!lu_attr) 
-                RETURN(-ENOMEM);
-       
+        
         rc = obj_ids->do_ops->do_attr_get(ctxt, obj_ids, lu_attr);
         if (rc)
                 GOTO(out, rc);
-        
+
         if (lu_attr->la_size == 0)
                 GOTO(out, rc);
 
@@ -97,8 +94,6 @@ static int mdd_lov_read_objids(const struct lu_context *ctxt,
                        lov_info->mdd_lov_objids[i], i);
         }
 out:
-        if (lu_attr)
-                OBD_FREE_PTR(lu_attr);
         RETURN(0);
 }
 
@@ -113,10 +108,8 @@ static int mdd_lov_update_desc(const struct lu_context *ctxt,
         int rc = 0;
         ENTRY;
 
-        OBD_ALLOC(ld, sizeof(*ld));
-        if (!ld)
-                RETURN(-ENOMEM);
-
+        ld = &mdd_ctx_info(ctxt)->mti_ld;
+        
         rc = obd_get_info(lov_obd->obd_self_export, strlen(KEY_LOVDESC) + 1, 
                           KEY_LOVDESC, &valsize, ld);
         if (rc)
@@ -163,7 +156,6 @@ static int mdd_lov_update_desc(const struct lu_context *ctxt,
         CDEBUG(D_CONFIG, "updated max_mdsize/max_cookiesize: %d/%d\n",
                mdd->mdd_max_mdsize, mdd->mdd_max_cookiesize);
 out:
-        OBD_FREE(ld, sizeof(*ld));
         RETURN(rc);
 }