X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_handler.c;h=5a345d63768580a7dda373fdeb74ba9209e117c6;hp=c107ff0ae380810b3f528cbbe32f2586a63277f0;hb=2eac0e35ae662ba0839b0867820608ab4800fa44;hpb=b2cb6fd1095f9c483b7bc1ebbbfdaef719aea87c

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index c107ff0..5a345d6 100644
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -383,6 +383,7 @@ static int osd_commit_async(const struct lu_env *env, struct dt_device *dev)
 	tx_state_t	  *tx = &dmu_objset_pool(osd->od_objset.os)->dp_tx;
 	uint64_t	   txg;
 
+	mutex_enter(&tx->tx_sync_lock);
 	txg = tx->tx_open_txg + 1;
 	if (tx->tx_quiesce_txg_waiting < txg) {
 		tx->tx_quiesce_txg_waiting = txg;
@@ -695,6 +696,7 @@ static struct lu_device *osd_device_fini(const struct lu_env *env,
 	ENTRY;
 
 
+	osd_shutdown(env, o);
 	osd_oi_fini(env, o);
 
 	if (o->od_objset.os) {