# HG changeset patch
# User Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
# Date 1329608036 18000
# Node ID 83e1e7dfbc8f55da9f1584cdd3c2da1d5456dce3
# Parent  8abd7b12d92f84c5a9dae59e1ecb5b47002eda4e
2130 zvol DKIOCFREE uses nested DMU transactions
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Richard Elling <richard.elling@richardelling.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

diff -r 8abd7b12d92f -r 83e1e7dfbc8f usr/src/uts/common/fs/zfs/zvol.c
--- a/usr/src/uts/common/fs/zfs/zvol.c	Sat Feb 18 15:58:00 2012 -0500
+++ b/usr/src/uts/common/fs/zfs/zvol.c	Sat Feb 18 18:33:56 2012 -0500
@@ -1705,9 +1705,9 @@
 		} else {
 			zvol_log_truncate(zv, tx, df.df_start,
 			    df.df_length, B_TRUE);
+			dmu_tx_commit(tx);
 			error = dmu_free_long_range(zv->zv_objset, ZVOL_OBJ,
 			    df.df_start, df.df_length);
-			dmu_tx_commit(tx);
 		}
 
 		zfs_range_unlock(rl);