LU-10370 ofd: truncate does not update blocks count on client

[fs/lustre-release.git] / lustre / ofd / ofd_dev.c

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index da8b008..c2cda39 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -245,6 +245,11 @@ static void ofd_stack_fini(const struct lu_env *env, struct ofd_device *m,
        top->ld_ops->ldo_process_config(env, top, lcfg);
        OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens));
 
+       if (m->ofd_los != NULL) {
+               local_oid_storage_fini(env, m->ofd_los);
+               m->ofd_los = NULL;
+       }
+
        lu_site_purge(env, top->ld_site, ~0);
        if (!cfs_hash_is_empty(top->ld_site->ls_obj_hash)) {
                LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_OTHER, NULL);
@@ -257,6 +262,30 @@ static void ofd_stack_fini(const struct lu_env *env, struct ofd_device *m,
        EXIT;
 }
 
+static void ofd_stack_pre_fini(const struct lu_env *env, struct ofd_device *m,
+                              struct lu_device *top)
+{
+       struct lustre_cfg_bufs bufs;
+       struct lustre_cfg *lcfg;
+       ENTRY;
+
+       LASSERT(top);
+
+       lustre_cfg_bufs_reset(&bufs, ofd_name(m));
+       lustre_cfg_bufs_set_string(&bufs, 1, NULL);
+       OBD_ALLOC(lcfg, lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen));
+       if (!lcfg) {
+               CERROR("%s: failed to trigger LCFG_PRE_CLEANUP\n", ofd_name(m));
+       } else {
+               lustre_cfg_init(lcfg, LCFG_PRE_CLEANUP, &bufs);
+               top->ld_ops->ldo_process_config(env, top, lcfg);
+               OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount,
+                                             lcfg->lcfg_buflens));
+       }
+
+       EXIT;
+}
+
 /* For interoperability, see mdt_interop_param[]. */
 static struct cfg_interop_param ofd_interop_param[] = {
        { "ost.quota_type",     NULL },
@@ -2052,7 +2081,12 @@ out:
                res = ldlm_resource_get(ns, NULL, &tsi->tsi_resid,
                                        LDLM_EXTENT, 0);
                if (!IS_ERR(res)) {
+                       struct ost_lvb *res_lvb;
+
                        ldlm_res_lvbo_update(res, NULL, 0);
+                       res_lvb = res->lr_lvb_data;
+                       repbody->oa.o_valid |= OBD_MD_FLBLOCKS;
+                       repbody->oa.o_blocks = res_lvb->lvb_blocks;
                        ldlm_resource_putref(res);
                }
        }
@@ -2878,6 +2912,7 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
 
        spin_lock_init(&m->ofd_flags_lock);
        m->ofd_raid_degraded = 0;
+       m->ofd_checksum_t10pi_enforce = 0;
        m->ofd_syncjournal = 0;
        ofd_slc_set(m);
        m->ofd_soft_sync_limit = OFD_SOFT_SYNC_LIMIT_DEFAULT;
@@ -2953,7 +2988,8 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
        tgd->tgd_reserved_pcnt = 0;
 
        m->ofd_brw_size = m->ofd_lut.lut_dt_conf.ddp_brw_size;
-       m->ofd_cksum_types_supported = cksum_types_supported_server();
+       m->ofd_cksum_types_supported =
+               obd_cksum_types_supported_server(obd->obd_name);
        m->ofd_precreate_batch = OFD_PRECREATE_BATCH_DEFAULT;
        if (tgd->tgd_osfs.os_bsize * tgd->tgd_osfs.os_blocks <
            OFD_PRECREATE_SMALL_FS)
@@ -3027,6 +3063,7 @@ static void ofd_fini(const struct lu_env *env, struct ofd_device *m)
        stop.ls_status = LS_PAUSED;
        stop.ls_flags = 0;
        lfsck_stop(env, m->ofd_osd, &stop);
+       ofd_stack_pre_fini(env, m, &m->ofd_dt_dev.dd_lu_dev);
        target_recovery_fini(obd);
        if (m->ofd_namespace != NULL)
                ldlm_namespace_free_prior(m->ofd_namespace, NULL,
@@ -3042,11 +3079,6 @@ static void ofd_fini(const struct lu_env *env, struct ofd_device *m)
        nm_config_file_deregister_tgt(env, obd->u.obt.obt_nodemap_config_file);
        obd->u.obt.obt_nodemap_config_file = NULL;
 
-       if (m->ofd_los != NULL) {
-               local_oid_storage_fini(env, m->ofd_los);
-               m->ofd_los = NULL;
-       }
-
        if (m->ofd_namespace != NULL) {
                ldlm_namespace_free_post(m->ofd_namespace);
                d->ld_obd->obd_namespace = m->ofd_namespace = NULL;