LU-15727 lod: honor append_pool with default composite layouts

[fs/lustre-release.git] / lustre / osp / osp_md_object.c

diff --git a/lustre/osp/osp_md_object.c b/lustre/osp/osp_md_object.c
index 6ee2c99..6ff56f4 100644 (file)
--- a/lustre/osp/osp_md_object.c
+++ b/lustre/osp/osp_md_object.c
@@ -305,7 +305,6 @@ static void osp_md_ah_init(const struct lu_env *env,
        LASSERT(ah);
 
        ah->dah_parent = parent;
-       ah->dah_mode = child_mode;
 }
 
 /**
@@ -518,7 +517,7 @@ static int osp_md_index_lookup(const struct lu_env *env, struct dt_object *dt,
        }
 
        fid = lbuf->lb_buf;
-       if (ptlrpc_rep_need_swab(req))
+       if (req_capsule_rep_need_swab(&req->rq_pill))
                lustre_swab_lu_fid(fid);
        if (!fid_is_sane(fid)) {
                CERROR("%s: lookup "DFID" %s invalid fid "DFID"\n",
@@ -1024,6 +1023,15 @@ int osp_md_declare_destroy(const struct lu_env *env, struct dt_object *dt,
        return osp_trans_update_request_create(th);
 }
 
+static int osp_destroy_interpreter(const struct lu_env *env,
+                                  struct object_update_reply *reply,
+                                  struct ptlrpc_request *req,
+                                  struct osp_object *obj,
+                                  void *data, int index, int rc)
+{
+       return 0;
+}
+
 /**
  * Implement OSP layer dt_object_operations::do_destroy() interface.
  *
@@ -1046,9 +1054,10 @@ int osp_md_destroy(const struct lu_env *env, struct dt_object *dt,
        struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
        struct osp_update_request *update;
        int rc = 0;
-
        ENTRY;
+
        o->opo_non_exist = 1;
+       o->opo_destroyed = 1;
 
        LASSERT(osp->opd_connect_mdt);
        update = thandle_to_osp_update_request(th);
@@ -1059,6 +1068,12 @@ int osp_md_destroy(const struct lu_env *env, struct dt_object *dt,
        if (rc != 0)
                RETURN(rc);
 
+       /* retain the object and it's status until it's destroyed on remote */
+       rc = osp_insert_update_callback(env, update, o, NULL,
+                                       osp_destroy_interpreter);
+       if (rc != 0)
+               RETURN(rc);
+
        set_bit(LU_OBJECT_HEARD_BANSHEE, &dt->do_lu.lo_header->loh_flags);
        rc = osp_insert_update_callback(env, update, dt2osp_obj(dt), NULL,
                                        NULL);
@@ -1120,6 +1135,9 @@ static ssize_t osp_md_declare_write(const struct lu_env *env,
        struct osp_device *osp = dt2osp_dev(th->th_dev);
        int rc;
 
+       if (dt2osp_obj(dt)->opo_destroyed)
+               return -ENOENT;
+
        rc = osp_trans_update_request_create(th);
        if (rc != 0)
                return rc;
@@ -1176,6 +1194,9 @@ static ssize_t osp_md_write(const struct lu_env *env, struct dt_object *dt,
        ssize_t                   rc;
        ENTRY;
 
+       if (obj->opo_destroyed)
+               RETURN(-ENOENT);
+
        update = thandle_to_osp_update_request(th);
        LASSERT(update != NULL);
 
@@ -1241,6 +1262,9 @@ static ssize_t osp_md_read(const struct lu_env *env, struct dt_object *dt,
        int rc;
        ENTRY;
 
+       if (dt2osp_obj(dt)->opo_destroyed)
+               RETURN(-ENOENT);
+
        /* Because it needs send the update buffer right away,
         * just create an update buffer, instead of attaching the
         * update_remote list of the thandle.  */