kill obsolete ->mdo_mkdir() method

diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h
index 780adad..32f2aec 100644 (file)
--- a/lustre/include/md_object.h
+++ b/lustre/include/md_object.h
@@ -77,10 +77,6 @@ struct md_dir_operations {
         int (*mdo_lookup)(const struct lu_context *, struct md_object *,
                           const char *, struct lu_fid *);
 
-        int (*mdo_mkdir)(const struct lu_context *, struct lu_attr *,
-                         struct md_object *, const char *,
-                         struct md_object *);
-
         int (*mdo_create)(const struct lu_context *, struct md_object *,
                           const char *, struct md_object *,
                           struct lu_attr *);
@@ -264,14 +260,6 @@ static inline int mdo_lookup(const struct lu_context *cx, struct md_object *p,
         return p->mo_dir_ops->mdo_lookup(cx, p, name, f);
 }
 
-static inline int mdo_mkdir(const struct lu_context *cx, struct lu_attr *at,
-                            struct md_object *p, const char *name,
-                            struct md_object *c)
-{
-        LASSERT(p->mo_dir_ops->mdo_mkdir);
-        return p->mo_dir_ops->mdo_mkdir(cx, at, p, name, c);
-}
-
 static inline int mdo_create(const struct lu_context *cx,
                              struct md_object *p, const char *name,
                              struct md_object *c, struct lu_attr *at)

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index fecde1e..67dd199 100644 (file)
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -183,7 +183,7 @@ mdd_attr_get(const struct lu_context *ctxt,
 
         next = mdd_object_child(mdd_obj);
         rc = next->do_ops->do_attr_get(ctxt, next, attr);
-               
+
         RETURN(rc);
 }
 
@@ -196,12 +196,12 @@ mdd_xattr_get(const struct lu_context *ctxt, struct md_object *obj, void *buf,
         int rc;
 
         ENTRY;
-       
-        LASSERT(lu_object_exists(ctxt, &obj->mo_lu)); 
+
+        LASSERT(lu_object_exists(ctxt, &obj->mo_lu));
 
         next = mdd_object_child(mdd_obj);
         rc = next->do_ops->do_xattr_get(ctxt, next, buf, buf_len, name);
-        
+
         RETURN(rc);
 }
 
@@ -211,13 +211,13 @@ __mdd_object_destroy(const struct lu_context *ctxt, struct mdd_object *obj,
 {
         struct dt_object  *next = mdd_object_child(obj);
         int rc = 0;
-       
+
         ENTRY;
         if (lu_object_exists(ctxt, &obj->mod_obj.mo_lu))
                 rc = next->do_ops->do_object_destroy(ctxt, next, handle);
-         
+
         LASSERT(ergo(rc == 0, !lu_object_exists(ctxt, &obj->mod_obj.mo_lu)));
-        
+
         RETURN(rc);
 }
 
@@ -420,16 +420,16 @@ static int mdd_lov_init(struct mdd_device *mdd, struct lustre_cfg *cfg)
         int rc;
         ENTRY;
 
-        /*FIXME lov device is a dt or obd device in this cycle?*/ 
- 
-        rc = dt_device_init(&mdd->mdd_lov_dev, NULL); 
-        if (rc) 
+        /*FIXME lov device is a dt or obd device in this cycle?*/
+
+        rc = dt_device_init(&mdd->mdd_lov_dev, NULL);
+        if (rc)
                 GOTO(out, rc);
-               
-        mdd->mdd_lov_dev.dd_lu_dev.ld_obd = 
+
+        mdd->mdd_lov_dev.dd_lu_dev.ld_obd =
                 class_name2obd(lustre_cfg_string(cfg, 3));
 out:
-        RETURN(rc); 
+        RETURN(rc);
 }
 
 static int mdd_process_config(const struct lu_context *ctx,
@@ -603,10 +603,10 @@ __mdd_xattr_set(const struct lu_context *ctxt, struct mdd_device *mdd,
                 int buf_len, const char *name, struct thandle *handle)
 {
         struct dt_object *next;
-        
+
         LASSERT(lu_object_exists(ctxt, &obj->mod_obj.mo_lu));
         next = mdd_object_child(obj);
-        return next->do_ops->do_xattr_set(ctxt, next, buf, buf_len, name, 
+        return next->do_ops->do_xattr_set(ctxt, next, buf, buf_len, name,
                                           handle);
 }
 
@@ -736,26 +736,26 @@ mdd_unlink(const struct lu_context *ctxt, struct md_object *pobj,
         handle = mdd_trans_start(ctxt, mdd);
         if (IS_ERR(handle))
                 RETURN(PTR_ERR(handle));
-        
+
         mdd_lock2(ctxt, mdd_pobj, mdd_cobj);
-        
-        rc = __mdd_index_delete(ctxt, mdd, mdd_pobj, name, handle); 
+
+        rc = __mdd_index_delete(ctxt, mdd, mdd_pobj, name, handle);
         if (rc)
                 GOTO(cleanup, rc);
-        
+
         rc = __mdd_ref_del(ctxt, mdd_pobj, handle);
         if (rc)
                 GOTO(cleanup, rc);
 
         rc = __mdd_ref_del(ctxt, mdd_cobj, handle);
         if (rc)
-                GOTO(cleanup, rc); 
+                GOTO(cleanup, rc);
 cleanup:
-       /*FIXME: error handling*/ 
+       /*FIXME: error handling*/
         mdd_lock2(ctxt, mdd_pobj, mdd_cobj);
         mdd_trans_stop(ctxt, mdd, handle);
         RETURN(rc);
-} 
+}
 
 static void mdd_rename_lock(struct mdd_device *mdd,
                             struct mdd_object *src_pobj,
@@ -811,7 +811,7 @@ mdd_rename(const struct lu_context *ctxt, struct md_object *src_pobj,
                         GOTO(cleanup, rc);
         }
 cleanup:
-       /*FIXME: error handling*/ 
+       /*FIXME: error handling*/
         mdd_rename_unlock(mdd, mdd_spobj, mdd_tpobj, /*mdd_sobj,*/ mdd_tobj);
         mdd_trans_stop(ctxt, mdd, handle);
         RETURN(rc);
@@ -854,37 +854,6 @@ cleanup:
         RETURN(rc);
 }
 
-static int mdd_mkdir(const struct lu_context *ctxt, struct lu_attr* attr,
-                     struct md_object *pobj, const char *name,
-                     struct md_object *child)
-{
-        struct mdd_device *mdd = mdo2mdd(pobj);
-        struct mdd_object *mdo = mdo2mddo(pobj);
-        struct thandle *handle;
-        int rc = 0;
-        ENTRY;
-
-        mdd_txn_param_build(ctxt, &MDD_TXN_MKDIR);
-        handle = mdd_trans_start(ctxt, mdd);
-        if (IS_ERR(handle))
-                RETURN(PTR_ERR(handle));
-
-        mdd_lock(ctxt, mdo, DT_WRITE_LOCK);
-
-        rc = __mdd_object_create(ctxt, mdo2mddo(child), attr, handle);
-        if (rc)
-                GOTO(cleanup, rc);
-
-        rc = __mdd_index_insert(ctxt, mdo, lu_object_fid(&child->mo_lu),
-                                name, handle);
-        if (rc)
-                GOTO(cleanup, rc);
-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)
 {
@@ -947,7 +916,7 @@ __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));
         next = mdd_object_child(obj);
         return next->do_ops->do_object_ref_add(ctxt, next, handle);
@@ -968,7 +937,7 @@ static int mdd_ref_add(const struct lu_context *ctxt, struct md_object *obj)
         rc = __mdd_ref_add(ctxt, mdd_obj, handle);
 
         mdd_trans_stop(ctxt, mdd, handle);
-               
+
         RETURN(rc);
 }
 
@@ -977,8 +946,8 @@ __mdd_ref_del(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_del(ctxt, next, handle);
 }
@@ -998,7 +967,7 @@ static int mdd_ref_del(const struct lu_context *ctxt, struct md_object *obj)
         rc = __mdd_ref_del(ctxt, mdd_obj, handle);
 
         mdd_trans_stop(ctxt, mdd, handle);
-               
+
         RETURN(rc);
 }
 
@@ -1011,7 +980,6 @@ struct md_device_operations mdd_ops = {
 static struct md_dir_operations mdd_dir_ops = {
         .mdo_lookup        = mdd_lookup,
         .mdo_create        = mdd_create,
-        .mdo_mkdir         = mdd_mkdir,
         .mdo_rename        = mdd_rename,
         .mdo_link          = mdd_link,
         .mdo_name_insert   = mdd_mkname,
@@ -1060,9 +1028,9 @@ static void mdd_device_free(const struct lu_context *ctx, struct lu_device *lu)
 
         LASSERT(atomic_read(&lu->ld_ref) == 0);
         md_device_fini(&m->mdd_md_dev);
-        
+
         class_put_type(dt_lov->dd_lu_dev.ld_type->ldt_obd_type);
-        
+
         OBD_FREE_PTR(m);
 }
 

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index 8fdbfe2..25190f9 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -96,9 +96,8 @@ static int mdt_md_mkdir(struct mdt_thread_info *info)
         if (!IS_ERR(child)) {
                 struct md_object *next = mdt_object_child(parent);
 
-                result = mdo_mkdir(info->mti_ctxt, &info->mti_attr, next,
-                                   info->mti_rr.rr_name,
-                                   mdt_object_child(child));
+                result = mdo_create(info->mti_ctxt, next, info->mti_rr.rr_name,
+                                    mdt_object_child(child), &info->mti_attr);
                 mdt_object_put(info->mti_ctxt, child);
         } else
                 result = PTR_ERR(child);
@@ -261,7 +260,7 @@ static int mdt_reint_open(struct mdt_thread_info *info)
                 intent_set_disposition(ldlm_rep, DISP_OPEN_CREATE);
                 if (result != 0)
                         GOTO(out_child, result);
-                created = 1; 
+                created = 1;
         } else if (info->mti_rr.rr_flags & MDS_OPEN_EXCL &&
                    info->mti_rr.rr_flags & MDS_OPEN_CREAT) {
                         GOTO(out_child, result = -EEXIST);
@@ -281,7 +280,7 @@ static int mdt_reint_open(struct mdt_thread_info *info)
         lmm = req_capsule_server_get(&info->mti_pill,
                                      &RMF_MDT_MD);
 
-        result = mo_xattr_get(info->mti_ctxt, mdt_object_child(child), 
+        result = mo_xattr_get(info->mti_ctxt, mdt_object_child(child),
                               lmm, MAX_MD_SIZE, "lov");
         if (result <= 0)
                 GOTO(destroy_child, result = -EINVAL);