LU-8119 osd: remove dcb entry from the list prior processing.

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

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index f57e3a7..9c09620 100644 (file)
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -147,8 +147,13 @@ static void osd_trans_commit_cb(void *cb_data, int error)
        dt_txn_hook_commit(th);
 
        /* call per-transaction callbacks if any */
-       list_for_each_entry_safe(dcb, tmp, &oh->ot_dcb_list, dcb_linkage)
+       list_for_each_entry_safe(dcb, tmp, &oh->ot_dcb_list, dcb_linkage) {
+               LASSERTF(dcb->dcb_magic == TRANS_COMMIT_CB_MAGIC,
+                        "commit callback entry: magic=%x name='%s'\n",
+                        dcb->dcb_magic, dcb->dcb_name);
+               list_del_init(&dcb->dcb_linkage);
                dcb->dcb_func(NULL, th, dcb, error);
+       }
 
        /* Unlike ldiskfs, zfs updates space accounting at commit time.
         * As a consequence, op_end is called only now to inform the quota slave
@@ -295,16 +300,6 @@ static int osd_trans_stop(const struct lu_env *env, struct dt_device *dt,
                RETURN(0);
        }
 
-       /* When doing our own inode accounting, the ZAPs storing per-uid/gid
-        * usage are updated at operation execution time, so we should call
-        * qsd_op_end() straight away. Otherwise (for blk accounting maintained
-        * by ZFS and when #inode is estimated from #blks) accounting is updated
-        * at commit time and the call to qsd_op_end() must be delayed */
-       if (oh->ot_quota_trans.lqt_id_cnt > 0 &&
-                       !oh->ot_quota_trans.lqt_ids[0].lqi_is_blk &&
-                       !osd->od_quota_iused_est)
-               qsd_op_end(env, osd->od_quota_slave, &oh->ot_quota_trans);
-
        rc = dt_txn_hook_stop(env, th);
        if (rc != 0)
                CDEBUG(D_OTHER, "%s: transaction hook failed: rc = %d\n",
@@ -1068,10 +1063,6 @@ static int osd_mount(const struct lu_env *env,
        if (rc)
                GOTO(err, rc);
 
-       /* Use our own ZAP for inode accounting by default, this can be changed
-        * via procfs to estimate the inode usage from the block usage */
-       o->od_quota_iused_est = 0;
-
        rc = osd_procfs_init(o, o->od_svname);
        if (rc)
                GOTO(err, rc);