changeset 13614:83e1e7dfbc8f

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>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Sat, 18 Feb 2012 18:33:56 -0500
parents 8abd7b12d92f
children 824064bb7f53
files usr/src/uts/common/fs/zfs/zvol.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);