X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_handler.c;h=9c09620b201f400fabc8019663f9042213724a96;hp=fa04e09bd1c0bed54334637714eca4eb6c8cee73;hb=aa64476cef7d5f0050de20839925868013caa0b6;hpb=de10075373c80cb0200726ea4f13eddcf38895fd

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index fa04e09..9c09620 100644
--- 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