Whamcloud - gitweb
LU-14927 quota: move qsd_transfer to lquota module
[fs/lustre-release.git] / lustre / osd-zfs / osd_object.c
index d2b2f03..34dfae4 100644 (file)
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/osd-zfs/osd_object.c
  *
@@ -64,9 +63,9 @@
 char *osd_obj_tag = "osd_object";
 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;
-static struct dt_object_operations osd_obj_otable_it_ops;
+static const struct dt_object_operations osd_obj_ops;
+static const struct lu_object_operations osd_lu_obj_ops;
+static const struct dt_object_operations osd_obj_otable_it_ops;
 
 static void
 osd_object_sa_fini(struct osd_object *obj)
@@ -128,17 +127,19 @@ void osd_object_sa_dirty_rele(const struct lu_env *env, struct osd_thandle *oh)
                write_lock(&obj->oo_attr_lock);
                list_del_init(&obj->oo_sa_linkage);
                write_unlock(&obj->oo_attr_lock);
-               if (obj->oo_late_xattr) {
+               if (obj->oo_late_xattr && obj->oo_destroyed == 0) {
                        /*
                         * take oo_guard to protect oo_sa_xattr buffer
                         * from concurrent update by osd_xattr_set()
                         */
                        LASSERT(oh->ot_assigned != 0);
                        down_write(&obj->oo_guard);
-                       if (obj->oo_late_attr_set)
-                               __osd_sa_attr_init(env, obj, oh);
-                       else if (obj->oo_late_xattr)
-                               __osd_sa_xattr_update(env, obj, oh);
+                       if (obj->oo_destroyed == 0) {
+                               if (obj->oo_late_attr_set)
+                                       __osd_sa_attr_init(env, obj, oh);
+                               else if (obj->oo_late_xattr)
+                                       __osd_sa_xattr_update(env, obj, oh);
+                       }
                        up_write(&obj->oo_guard);
                }
                sa_spill_rele(obj->oo_sa_hdl);
@@ -186,20 +187,24 @@ osd_object_sa_bulk_update(struct osd_object *obj, sa_bulk_attr_t *attrs,
 static int __osd_object_attr_get(const struct lu_env *env, struct osd_device *o,
                                 struct osd_object *obj, struct lu_attr *la)
 {
-       struct osa_attr *osa = &osd_oti_get(env)->oti_osa;
-       sa_bulk_attr_t  *bulk = osd_oti_get(env)->oti_attr_bulk;
-       int              cnt = 0;
+       struct osa_attr *osa = &osd_oti_get(env)->oti_osa;
+       sa_bulk_attr_t *bulk = osd_oti_get(env)->oti_attr_bulk;
+       struct lustre_mdt_attrs *lma;
+       struct lu_buf buf;
+       int cnt = 0;
        int              rc;
        ENTRY;
 
        LASSERT(obj->oo_dn != NULL);
 
-       la->la_valid |= LA_ATIME | LA_MTIME | LA_CTIME | LA_MODE | LA_TYPE |
-                       LA_SIZE | LA_UID | LA_GID | LA_FLAGS | LA_NLINK;
+       la->la_valid |= LA_ATIME | LA_MTIME | LA_CTIME | LA_BTIME | LA_MODE |
+                       LA_TYPE | LA_SIZE | LA_UID | LA_GID | LA_FLAGS |
+                       LA_NLINK;
 
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(o), NULL, osa->atime, 16);
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(o), NULL, osa->mtime, 16);
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(o), NULL, osa->ctime, 16);
+       SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CRTIME(o), NULL, osa->btime, 16);
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MODE(o), NULL, &osa->mode, 8);
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_SIZE(o), NULL, &osa->size, 8);
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(o), NULL, &osa->nlink, 8);
@@ -234,6 +239,7 @@ static int __osd_object_attr_get(const struct lu_env *env, struct osd_device *o,
        la->la_atime = osa->atime[0];
        la->la_mtime = osa->mtime[0];
        la->la_ctime = osa->ctime[0];
+       la->la_btime = osa->btime[0];
        la->la_mode = osa->mode;
        la->la_uid = osa->uid;
        la->la_gid = osa->gid;
@@ -241,27 +247,22 @@ static int __osd_object_attr_get(const struct lu_env *env, struct osd_device *o,
        la->la_flags = attrs_zfs2fs(osa->flags);
        la->la_size = osa->size;
 
-       /* Try to get extra flag from LMA. Right now, only LMAI_ORPHAN
-        * flags is stored in LMA, and it is only for orphan directory */
-       if (S_ISDIR(la->la_mode) && dt_object_exists(&obj->oo_dt)) {
-               struct osd_thread_info *info = osd_oti_get(env);
-               struct lustre_mdt_attrs *lma;
-               struct lu_buf buf;
-
-               lma = (struct lustre_mdt_attrs *)info->oti_buf;
-               buf.lb_buf = lma;
-               buf.lb_len = sizeof(info->oti_buf);
-               rc = osd_xattr_get(env, &obj->oo_dt, &buf, XATTR_NAME_LMA);
-               if (rc > 0) {
-                       rc = 0;
-                       lma->lma_incompat = le32_to_cpu(lma->lma_incompat);
-                       obj->oo_lma_flags =
-                               lma_to_lustre_flags(lma->lma_incompat);
-
-               } else if (rc == -ENODATA) {
-                       rc = 0;
-               }
+       /* Try to get extra flags from LMA */
+       lma = (struct lustre_mdt_attrs *)osd_oti_get(env)->oti_buf;
+       buf.lb_buf = lma;
+       buf.lb_len = sizeof(osd_oti_get(env)->oti_buf);
+       down_read(&obj->oo_guard);
+       rc = osd_xattr_get_lma(env, obj, &buf);
+       if (!rc) {
+               lma->lma_incompat = le32_to_cpu(lma->lma_incompat);
+               obj->oo_lma_flags =
+                       lma_to_lustre_flags(lma->lma_incompat);
+       } else if (rc == -ENODATA ||
+                  !(S_ISDIR(la->la_mode) &&
+                    dt_object_exists(&obj->oo_dt))) {
+               rc = 0;
        }
+       up_read(&obj->oo_guard);
 
        if (S_ISCHR(la->la_mode) || S_ISBLK(la->la_mode)) {
                rc = -sa_lookup(obj->oo_sa_hdl, SA_ZPL_RDEV(o), &osa->rdev, 8);
@@ -616,9 +617,12 @@ zget:
                GOTO(out, rc = 0);
 
        rc = osd_check_lma(env, obj);
-       if ((!rc && !remote) || (rc != -EREMCHG))
+       if (rc != -EREMCHG)
                GOTO(out, rc);
 
+       osd_scrub_refresh_mapping(env, osd, fid, oid, DTO_INDEX_DELETE, true,
+                                 NULL);
+
 trigger:
        /* We still have chance to get the valid dnode: for the object that is
         * referenced by remote name entry, the object on the local MDT will be
@@ -641,7 +645,7 @@ trigger:
        }
 
        /* The case someone triggered the OI scrub already. */
-       if (thread_is_running(&scrub->os_thread)) {
+       if (scrub->os_running) {
                if (!rc) {
                        LASSERT(remote);
 
@@ -655,14 +659,15 @@ trigger:
        }
 
        /* The case NOT allow to trigger OI scrub automatically. */
-       if (osd->od_auto_scrub_interval == AS_NEVER)
+       if (osd->od_scrub.os_auto_scrub_interval == AS_NEVER)
                GOTO(out, rc);
 
        /* It is me to trigger the OI scrub. */
        rc1 = osd_scrub_start(env, osd, SS_CLEAR_DRYRUN |
                              SS_CLEAR_FAILOUT | SS_AUTO_FULL);
-       LCONSOLE_WARN("%s: trigger OI scrub by RPC for the "DFID": rc = %d\n",
-                     osd_name(osd), PFID(fid), rc1);
+       CDEBUG_LIMIT(D_LFSCK | D_CONSOLE | D_WARNING,
+                    "%s: trigger OI scrub by RPC for "DFID"/%#llx: rc = %d\n",
+                    osd_name(osd), PFID(fid), oid, rc1);
        if (!rc) {
                LASSERT(remote);
 
@@ -694,11 +699,10 @@ static void osd_object_free(const struct lu_env *env, struct lu_object *l)
        LASSERT(osd_invariant(obj));
 
        dt_object_fini(&obj->oo_dt);
+       /* obj doesn't contain an lu_object_header, so we don't need call_rcu */
        OBD_SLAB_FREE_PTR(obj, osd_object_kmem);
-       if (unlikely(h)) {
-               lu_object_header_fini(h);
-               OBD_FREE_PTR(h);
-       }
+       if (unlikely(h))
+               lu_object_header_free(h);
 }
 
 static int
@@ -757,7 +761,7 @@ static int osd_declare_destroy(const struct lu_env *env, struct dt_object *dt,
        LASSERT(th != NULL);
        LASSERT(dt_object_exists(dt));
 
-       oh = container_of0(th, struct osd_thandle, ot_super);
+       oh = container_of(th, struct osd_thandle, ot_super);
        LASSERT(oh->ot_tx != NULL);
 
        dmu_tx_mark_netfree(oh->ot_tx);
@@ -823,7 +827,7 @@ static int osd_destroy(const struct lu_env *env, struct dt_object *dt,
 
        LASSERT(obj->oo_dn != NULL);
 
-       oh = container_of0(th, struct osd_thandle, ot_super);
+       oh = container_of(th, struct osd_thandle, ot_super);
        LASSERT(oh != NULL);
        LASSERT(oh->ot_tx != NULL);
 
@@ -852,12 +856,12 @@ static int osd_destroy(const struct lu_env *env, struct dt_object *dt,
                LASSERT(obj->oo_attr.la_size <= osd_sync_destroy_max_size);
                rc = -dmu_object_free(osd->od_os, oid, oh->ot_tx);
                if (rc)
-                       CERROR("%s: failed to free %s %llu: rc = %d\n",
+                       CERROR("%s: failed to free %s/%#llx: rc = %d\n",
                               osd->od_svname, buf, oid, rc);
        } else if (obj->oo_destroy == OSD_DESTROY_SYNC) {
                rc = -dmu_object_free(osd->od_os, oid, oh->ot_tx);
                if (rc)
-                       CERROR("%s: failed to free %s %llu: rc = %d\n",
+                       CERROR("%s: failed to free %s/%#llx: rc = %d\n",
                               osd->od_svname, buf, oid, rc);
        } else { /* asynchronous destroy */
                char *key = info->oti_key;
@@ -870,7 +874,7 @@ static int osd_destroy(const struct lu_env *env, struct dt_object *dt,
                rc = osd_zap_add(osd, osd->od_unlinked->dn_object,
                                 osd->od_unlinked, key, 8, 1, &oid, oh->ot_tx);
                if (rc)
-                       CERROR("%s: zap_add_int() failed %s %llu: rc = %d\n",
+                       CERROR("%s: zap_add_int() failed %s/%#llx: rc = %d\n",
                               osd->od_svname, buf, oid, rc);
        }
 
@@ -985,10 +989,11 @@ static int osd_write_locked(const struct lu_env *env, struct dt_object *dt)
 static int osd_attr_get(const struct lu_env *env, struct dt_object *dt,
                        struct lu_attr *attr)
 {
-       struct osd_object       *obj = osd_dt_obj(dt);
-       uint64_t                 blocks;
-       uint32_t                 blksize;
-       int                      rc = 0;
+       struct osd_object *obj = osd_dt_obj(dt);
+       struct osd_device *osd = osd_obj2dev(obj);
+       uint64_t blocks;
+       uint32_t blksize;
+       int rc = 0;
 
        down_read(&obj->oo_guard);
 
@@ -1007,9 +1012,13 @@ static int osd_attr_get(const struct lu_env *env, struct dt_object *dt,
                attr->la_valid |= LA_FLAGS;
                attr->la_flags |= LUSTRE_ORPHAN_FL;
        }
+       if (obj->oo_lma_flags & LUSTRE_ENCRYPT_FL) {
+               attr->la_valid |= LA_FLAGS;
+               attr->la_flags |= LUSTRE_ENCRYPT_FL;
+       }
        read_unlock(&obj->oo_attr_lock);
        if (attr->la_valid & LA_FLAGS && attr->la_flags & LUSTRE_ORPHAN_FL)
-               CDEBUG(D_INFO, "%s: set orphan flag on "DFID" (%llx/%x)\n",
+               CDEBUG(D_INFO, "%s: set orphan flag on "DFID" (%#llx/%#x)\n",
                       osd_obj2dev(obj)->od_svname,
                       PFID(lu_object_fid(&dt->do_lu)),
                       attr->la_valid, obj->oo_lma_flags);
@@ -1020,8 +1029,11 @@ static int osd_attr_get(const struct lu_env *env, struct dt_object *dt,
        sa_object_size(obj->oo_sa_hdl, &blksize, &blocks);
        /* we do not control size of indices, so always calculate
         * it from number of blocks reported by DMU */
-       if (S_ISDIR(attr->la_mode))
+       if (S_ISDIR(attr->la_mode)) {
                attr->la_size = 512 * blocks;
+               rc = -zap_count(osd->od_os, obj->oo_dn->dn_object,
+                               &attr->la_dirent_count);
+       }
        /* Block size may be not set; suggest maximal I/O transfers. */
        if (blksize == 0)
                blksize = osd_spa_maxblocksize(
@@ -1036,67 +1048,6 @@ out:
        return rc;
 }
 
-/* Simple wrapper on top of qsd API which implement quota transfer for osd
- * setattr needs. As a reminder, only the root user can change ownership of
- * a file, that's why EDQUOT & EINPROGRESS errors are discarded */
-static inline int qsd_transfer(const struct lu_env *env,
-                              struct qsd_instance *qsd,
-                              struct lquota_trans *trans, int qtype,
-                              __u64 orig_id, __u64 new_id, __u64 bspace,
-                              struct lquota_id_info *qi, bool ignore_edquot)
-{
-       int     rc;
-
-       if (unlikely(qsd == NULL))
-               return 0;
-
-       LASSERT(qtype >= 0 && qtype < LL_MAXQUOTAS);
-       qi->lqi_type = qtype;
-
-       /* inode accounting */
-       qi->lqi_is_blk = false;
-
-       /* one more inode for the new owner ... */
-       qi->lqi_id.qid_uid = new_id;
-       qi->lqi_space      = 1;
-       rc = qsd_op_begin(env, qsd, trans, qi, NULL);
-       if (ignore_edquot && (rc == -EDQUOT || rc == -EINPROGRESS))
-               rc = 0;
-       if (rc)
-               return rc;
-
-       /* and one less inode for the current id */
-       qi->lqi_id.qid_uid = orig_id;;
-       qi->lqi_space      = -1;
-       /* can't get EDQUOT when reducing usage */
-       rc = qsd_op_begin(env, qsd, trans, qi, NULL);
-       if (rc == -EINPROGRESS)
-               rc = 0;
-       if (rc)
-               return rc;
-
-       /* block accounting */
-       qi->lqi_is_blk = true;
-
-       /* more blocks for the new owner ... */
-       qi->lqi_id.qid_uid = new_id;
-       qi->lqi_space      = bspace;
-       rc = qsd_op_begin(env, qsd, trans, qi, NULL);
-       if (ignore_edquot && (rc == -EDQUOT || rc == -EINPROGRESS))
-               rc = 0;
-       if (rc)
-               return rc;
-
-       /* and finally less blocks for the current owner */
-       qi->lqi_id.qid_uid = orig_id;
-       qi->lqi_space      = -bspace;
-       rc = qsd_op_begin(env, qsd, trans, qi, NULL);
-       /* can't get EDQUOT when reducing usage */
-       if (rc == -EINPROGRESS)
-               rc = 0;
-       return rc;
-}
-
 static int osd_declare_attr_set(const struct lu_env *env,
                                struct dt_object *dt,
                                const struct lu_attr *attr,
@@ -1117,11 +1068,11 @@ static int osd_declare_attr_set(const struct lu_env *env,
        LASSERT(handle != NULL);
        LASSERT(osd_invariant(obj));
 
-       oh = container_of0(handle, struct osd_thandle, ot_super);
+       oh = container_of(handle, struct osd_thandle, ot_super);
 
        down_read(&obj->oo_guard);
        if (unlikely(!dt_object_exists(dt) || obj->oo_destroyed))
-               GOTO(out, rc = 0);
+               GOTO(out_sem, rc = 0);
 
        LASSERT(obj->oo_sa_hdl != NULL);
        LASSERT(oh->ot_tx != NULL);
@@ -1143,7 +1094,7 @@ static int osd_declare_attr_set(const struct lu_env *env,
        if (!found)
                dmu_tx_hold_bonus(oh->ot_tx, obj->oo_dn->dn_object);
        if (oh->ot_tx->tx_err != 0)
-               GOTO(out, rc = -oh->ot_tx->tx_err);
+               GOTO(out_sem, rc = -oh->ot_tx->tx_err);
 
        if (attr && attr->la_valid & LA_FLAGS) {
                /* LMA is usually a part of bonus, no need to declare
@@ -1154,70 +1105,74 @@ static int osd_declare_attr_set(const struct lu_env *env,
                sa_object_size(obj->oo_sa_hdl, &blksize, &bspace);
                bspace = toqb(bspace * 512);
 
-               CDEBUG(D_QUOTA, "%s: enforce quota on UID %u, GID %u,"
-                      "the quota space is %lld (%u)\n", osd->od_svname,
+               CDEBUG(D_QUOTA,
+                      "%s: enforce quota on UID %u, GID %u, the quota space is %lld (%u)\n",
+                      osd->od_svname,
                       attr->la_uid, attr->la_gid, bspace, blksize);
        }
+       /* to preserve locking order - qsd_transfer() may need to flush
+        * currently running transaction when we're out of quota.
+        */
+       up_read(&obj->oo_guard);
 
-       if (attr && attr->la_valid & LA_UID) {
-               /* quota enforcement for user */
-               if (attr->la_uid != obj->oo_attr.la_uid) {
-                       rc = qsd_transfer(env, osd_def_qsd(osd),
-                                         &oh->ot_quota_trans, USRQUOTA,
-                                         obj->oo_attr.la_uid, attr->la_uid,
-                                         bspace, &info->oti_qi, true);
-                       if (rc)
-                               GOTO(out, rc);
-               }
+       /* quota enforcement for user */
+       if (attr && attr->la_valid & LA_UID &&
+           attr->la_uid != obj->oo_attr.la_uid) {
+               rc = qsd_transfer(env, osd_def_qsd(osd),
+                                 &oh->ot_quota_trans, USRQUOTA,
+                                 obj->oo_attr.la_uid, attr->la_uid,
+                                 bspace, &info->oti_qi);
+               if (rc)
+                       GOTO(out, rc);
        }
-       if (attr && attr->la_valid & LA_GID) {
-               /* quota enforcement for group */
-               if (attr->la_gid != obj->oo_attr.la_gid) {
-                       rc = qsd_transfer(env, osd_def_qsd(osd),
-                                         &oh->ot_quota_trans, GRPQUOTA,
-                                         obj->oo_attr.la_gid, attr->la_gid,
-                                         bspace, &info->oti_qi,
-                                         !(attr->la_flags &
-                                                       LUSTRE_SET_SYNC_FL));
-                       if (rc)
-                               GOTO(out, rc);
-               }
+
+       /* quota enforcement for group */
+       if (attr && attr->la_valid & LA_GID &&
+           attr->la_gid != obj->oo_attr.la_gid) {
+               rc = qsd_transfer(env, osd_def_qsd(osd),
+                                 &oh->ot_quota_trans, GRPQUOTA,
+                                 obj->oo_attr.la_gid, attr->la_gid,
+                                 bspace, &info->oti_qi);
+               if (rc)
+                       GOTO(out, rc);
        }
 #ifdef ZFS_PROJINHERIT
-       if (attr && attr->la_valid & LA_PROJID) {
-               /* quota enforcement for project */
-               if (attr->la_projid != obj->oo_attr.la_projid) {
-                       if (!osd->od_projectused_dn)
-                               GOTO(out, rc = -EOPNOTSUPP);
-
-                       /* Usually, if project quota is upgradable for the
-                        * device, then the upgrade will be done before or when
-                        * mount the device. So when we come here, this project
-                        * should have project ID attribute already (that is
-                        * zero by default).  Otherwise, there was something
-                        * wrong during the former upgrade, let's return failure
-                        * to report that.
-                        *
-                        * Please note that, different from other attributes,
-                        * you can NOT simply set the project ID attribute under
-                        * such case, because adding (NOT change) project ID
-                        * attribute needs to change the object's attribute
-                        * layout to match zfs backend quota accounting
-                        * requirement. */
-                       if (unlikely(!obj->oo_with_projid))
-                               GOTO(out, rc = -ENXIO);
-
-                       rc = qsd_transfer(env, osd_def_qsd(osd),
-                                         &oh->ot_quota_trans, PRJQUOTA,
-                                         obj->oo_attr.la_projid,
-                                         attr->la_projid, bspace,
-                                         &info->oti_qi, true);
-                       if (rc)
-                               GOTO(out, rc);
-               }
+       /* quota enforcement for project */
+       if (attr && attr->la_valid & LA_PROJID &&
+           attr->la_projid != obj->oo_attr.la_projid) {
+               if (!osd->od_projectused_dn)
+                       GOTO(out, rc = -EOPNOTSUPP);
+
+               /* Usually, if project quota is upgradable for the
+                * device, then the upgrade will be done before or when
+                * mount the device. So when we come here, this project
+                * should have project ID attribute already (that is
+                * zero by default).  Otherwise, there was something
+                * wrong during the former upgrade, let's return failure
+                * to report that.
+                *
+                * Please note that, different from other attributes,
+                * you can NOT simply set the project ID attribute under
+                * such case, because adding (NOT change) project ID
+                * attribute needs to change the object's attribute
+                * layout to match zfs backend quota accounting
+                * requirement.
+                */
+               if (unlikely(!obj->oo_with_projid))
+                       GOTO(out, rc = -ENXIO);
+
+               rc = qsd_transfer(env, osd_def_qsd(osd),
+                                 &oh->ot_quota_trans, PRJQUOTA,
+                                 obj->oo_attr.la_projid,
+                                 attr->la_projid, bspace,
+                                 &info->oti_qi);
+               if (rc)
+                       GOTO(out, rc);
        }
 #endif
 out:
+       RETURN(rc);
+out_sem:
        up_read(&obj->oo_guard);
        RETURN(rc);
 }
@@ -1252,7 +1207,7 @@ static int osd_attr_set(const struct lu_env *env, struct dt_object *dt,
        LASSERT(osd_invariant(obj));
        LASSERT(obj->oo_sa_hdl);
 
-       oh = container_of0(handle, struct osd_thandle, ot_super);
+       oh = container_of(handle, struct osd_thandle, ot_super);
        /* Assert that the transaction has been assigned to a
           transaction group. */
        LASSERT(oh->ot_tx->tx_txg != 0);
@@ -1329,6 +1284,9 @@ static int osd_attr_set(const struct lu_env *env, struct dt_object *dt,
                                CWARN("%s: failed to set LMA flags: rc = %d\n",
                                       osd->od_svname, rc);
                                GOTO(out, rc);
+                       } else {
+                               obj->oo_lma_flags =
+                                       la->la_flags & LUSTRE_LMA_FL_MASKS;
                        }
                }
        }
@@ -1472,7 +1430,7 @@ static int osd_declare_create(const struct lu_env *env, struct dt_object *dt,
        }
 
        LASSERT(handle != NULL);
-       oh = container_of0(handle, struct osd_thandle, ot_super);
+       oh = container_of(handle, struct osd_thandle, ot_super);
        LASSERT(oh->ot_tx != NULL);
 
        /* this is the minimum set of EAs on every Lustre object */
@@ -1522,7 +1480,6 @@ int __osd_attr_init(const struct lu_env *env, struct osd_device *osd,
        sa_bulk_attr_t *bulk = osd_oti_get(env)->oti_attr_bulk;
        struct osa_attr *osa = &osd_oti_get(env)->oti_osa;
        uint64_t gen;
-       uint64_t crtime[2];
        inode_timespec_t now;
        int cnt;
        int rc;
@@ -1534,7 +1491,7 @@ int __osd_attr_init(const struct lu_env *env, struct osd_device *osd,
 
        gen = dmu_tx_get_txg(tx);
        gethrestime(&now);
-       ZFS_TIME_ENCODE(&now, crtime);
+       ZFS_TIME_ENCODE(&now, osa->btime);
 
        osa->atime[0] = la->la_atime;
        osa->ctime[0] = la->la_ctime;
@@ -1584,7 +1541,7 @@ int __osd_attr_init(const struct lu_env *env, struct osd_device *osd,
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(osd), NULL, osa->atime, 16);
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(osd), NULL, osa->mtime, 16);
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(osd), NULL, osa->ctime, 16);
-       SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CRTIME(osd), NULL, crtime, 16);
+       SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CRTIME(osd), NULL, osa->btime, 16);
        SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(osd), NULL, &osa->nlink, 8);
 #ifdef ZFS_PROJINHERIT
        if (osd->od_projectused_dn)
@@ -1816,6 +1773,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;
@@ -1921,7 +1886,7 @@ static int osd_create(const struct lu_env *env, struct dt_object *dt,
        LASSERT(dof != NULL);
 
        LASSERT(th != NULL);
-       oh = container_of0(th, struct osd_thandle, ot_super);
+       oh = container_of(th, struct osd_thandle, ot_super);
 
        LASSERT(obj->oo_dn == NULL);
 
@@ -1933,6 +1898,8 @@ static int osd_create(const struct lu_env *env, struct dt_object *dt,
 
        /* we may fix some attributes, better do not change the source */
        obj->oo_attr = *attr;
+       obj->oo_attr.la_size = 0;
+       obj->oo_attr.la_nlink = 0;
        obj->oo_attr.la_valid |= LA_SIZE | LA_NLINK | LA_TYPE;
 
 #ifdef ZFS_PROJINHERIT
@@ -1952,7 +1919,7 @@ static int osd_create(const struct lu_env *env, struct dt_object *dt,
 
        zde->zde_pad = 0;
        zde->zde_dnode = dn->dn_object;
-       zde->zde_type = IFTODT(attr->la_mode & S_IFMT);
+       zde->zde_type = S_DT(attr->la_mode & S_IFMT);
 
        zapid = osd_get_name_n_idx(env, osd, fid, buf,
                                   sizeof(info->oti_str), &zdn);
@@ -2043,7 +2010,7 @@ static int osd_ref_add(const struct lu_env *env, struct dt_object *dt,
        LASSERT(osd_invariant(obj));
        LASSERT(obj->oo_sa_hdl != NULL);
 
-       oh = container_of0(handle, struct osd_thandle, ot_super);
+       oh = container_of(handle, struct osd_thandle, ot_super);
 
        write_lock(&obj->oo_attr_lock);
        nlink = ++obj->oo_attr.la_nlink;
@@ -2085,7 +2052,7 @@ static int osd_ref_del(const struct lu_env *env, struct dt_object *dt,
        LASSERT(osd_invariant(obj));
        LASSERT(obj->oo_sa_hdl != NULL);
 
-       oh = container_of0(handle, struct osd_thandle, ot_super);
+       oh = container_of(handle, struct osd_thandle, ot_super);
        LASSERT(!lu_object_is_dying(dt->do_lu.lo_header));
 
        write_lock(&obj->oo_attr_lock);
@@ -2103,18 +2070,13 @@ static int osd_object_sync(const struct lu_env *env, struct dt_object *dt,
                           __u64 start, __u64 end)
 {
        struct osd_device *osd = osd_obj2dev(osd_dt_obj(dt));
-       struct dmu_buf_impl *db = osd_dt_obj(dt)->oo_dn->dn_dbuf;
        uint64_t txg = 0;
        ENTRY;
 
        if (osd->od_dt_dev.dd_rdonly)
                RETURN(0);
 
-       mutex_enter(&db->db_mtx);
-       if (db->db_last_dirty)
-               txg = db->db_last_dirty->dr_txg;
-       mutex_exit(&db->db_mtx);
-
+       txg = osd_db_dirty_txg(osd_dt_obj(dt)->oo_dn->dn_dbuf);
        if (txg) {
                /* the object is dirty or being synced */
                if (osd_object_sync_delay_us < 0)
@@ -2131,7 +2093,12 @@ static int osd_invalidate(const struct lu_env *env, struct dt_object *dt)
        return 0;
 }
 
-static struct dt_object_operations osd_obj_ops = {
+static bool osd_check_stale(struct dt_object *dt)
+{
+       return false;
+}
+
+static const struct dt_object_operations osd_obj_ops = {
        .do_read_lock           = osd_read_lock,
        .do_write_lock          = osd_write_lock,
        .do_read_unlock         = osd_read_unlock,
@@ -2158,9 +2125,10 @@ static struct dt_object_operations osd_obj_ops = {
        .do_xattr_list          = osd_xattr_list,
        .do_object_sync         = osd_object_sync,
        .do_invalidate          = osd_invalidate,
+       .do_check_stale         = osd_check_stale,
 };
 
-static struct lu_object_operations osd_lu_obj_ops = {
+static const struct lu_object_operations osd_lu_obj_ops = {
        .loo_object_init        = osd_object_init,
        .loo_object_delete      = osd_object_delete,
        .loo_object_release     = osd_object_release,
@@ -2177,7 +2145,7 @@ static int osd_otable_it_attr_get(const struct lu_env *env,
        return 0;
 }
 
-static struct dt_object_operations osd_obj_otable_it_ops = {
+static const struct dt_object_operations osd_obj_otable_it_ops = {
        .do_attr_get            = osd_otable_it_attr_get,
        .do_index_try           = osd_index_try,
 };