X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fdsl_pool.c;h=3b285df650dd73dac0031fbcbf9a240efd5c2ea5;hb=04f9432d3bcb15ff8ed6ddc2dc377a4c0264340d;hp=ba42f0bdddb915d86e45f1200f6b3f2276a6f3e0;hpb=c409e4647f221ab724a0bd10c480ac95447203c3;p=zfs.git

diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c
index ba42f0b..3b285df 100644
--- a/module/zfs/dsl_pool.c
+++ b/module/zfs/dsl_pool.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 by Delphix. All rights reserved.
  */
 
 #include <sys/dsl_pool.h>
@@ -291,7 +292,10 @@ static int
 deadlist_enqueue_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
 {
 	dsl_deadlist_t *dl = arg;
+	dsl_pool_t *dp = dmu_objset_pool(dl->dl_os);
+	rw_enter(&dp->dp_config_rwlock, RW_READER);
 	dsl_deadlist_insert(dl, bp, tx);
+	rw_exit(&dp->dp_config_rwlock);
 	return (0);
 }
 
@@ -517,8 +521,10 @@ dsl_pool_tempreserve_space(dsl_pool_t *dp, uint64_t space, dmu_tx_t *tx)
 		reserved = dp->dp_space_towrite[tx->tx_txg & TXG_MASK]
 		    + dp->dp_tempreserved[tx->tx_txg & TXG_MASK] / 2;
 
-		if (reserved && reserved > write_limit)
+		if (reserved && reserved > write_limit) {
+			DMU_TX_STAT_BUMP(dmu_tx_write_limit);
 			return (ERESTART);
+		}
 	}
 
 	atomic_add_64(&dp->dp_tempreserved[tx->tx_txg & TXG_MASK], space);