LU-12133 osd-zfs: set blocksize to 8K for llog objects

[fs/lustre-release.git] / lustre / osd-zfs / osd_object.c

diff --git a/lustre/osd-zfs/osd_object.c b/lustre/osd-zfs/osd_object.c
index 3329093..63ab904 100644 (file)
--- a/lustre/osd-zfs/osd_object.c
+++ b/lustre/osd-zfs/osd_object.c
@@ -66,11 +66,8 @@ static int osd_object_sync_delay_us = -1;
 
 static struct dt_object_operations osd_obj_ops;
 static struct lu_object_operations osd_lu_obj_ops;
-extern struct dt_body_operations osd_body_ops;
 static struct dt_object_operations osd_obj_otable_it_ops;
 
-extern struct kmem_cache *osd_object_kmem;
-
 static void
 osd_object_sa_fini(struct osd_object *obj)
 {
@@ -458,7 +455,7 @@ static int osd_check_lma(const struct lu_env *env, struct osd_object *obj)
        const struct lu_fid *rfid = lu_object_fid(&obj->oo_dt.do_lu);
        ENTRY;
 
-       CLASSERT(sizeof(info->oti_buf) >= sizeof(*lma));
+       BUILD_BUG_ON(sizeof(info->oti_buf) < sizeof(*lma));
        lma = (struct lustre_mdt_attrs *)info->oti_buf;
        buf.lb_buf = lma;
        buf.lb_len = sizeof(info->oti_buf);
@@ -1303,7 +1300,7 @@ static int osd_attr_set(const struct lu_env *env, struct dt_object *dt,
 
                if (la->la_flags & LUSTRE_LMA_FL_MASKS) {
                        LASSERT(!obj->oo_pfid_in_lma);
-                       CLASSERT(sizeof(info->oti_buf) >= sizeof(*lma));
+                       BUILD_BUG_ON(sizeof(info->oti_buf) < sizeof(*lma));
                        lma = (struct lustre_mdt_attrs *)&info->oti_buf;
                        buf.lb_buf = lma;
                        buf.lb_len = sizeof(info->oti_buf);
@@ -1486,6 +1483,7 @@ static int osd_declare_create(const struct lu_env *env, struct dt_object *dt,
        switch (dof->dof_type) {
                case DFT_DIR:
                        dt->do_index_ops = &osd_dir_ops;
+                       /* fallthrough */
                case DFT_INDEX:
                        /* for zap create */
                        dmu_tx_hold_zap(oh->ot_tx, DMU_NEW_OBJECT, FALSE, NULL);
@@ -1818,6 +1816,14 @@ static dnode_t *osd_mkreg(const struct lu_env *env, struct osd_object *obj,
                               osd->od_svname, rc);
                        return ERR_PTR(rc);
                }
+       } else if ((fid_is_llog(fid))) {
+               rc = -dmu_object_set_blocksize(osd->od_os, dn->dn_object,
+                                              LLOG_MIN_CHUNK_SIZE, 0, oh->ot_tx);
+               if (unlikely(rc)) {
+                       CERROR("%s: can't change blocksize: %d\n",
+                              osd->od_svname, rc);
+                       return ERR_PTR(rc);
+               }
        }
 
        return dn;