diff options
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | 2012-02-18 18:33:56 -0500 |
|---|---|---|
| committer | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | 2012-02-18 18:33:56 -0500 |
| commit | c08b16378bf1d808956fc23b8c8ac30f3172a034 (patch) | |
| tree | fc9325ac51332f7af862665f67f71422e0d263aa /usr | |
| parent | 9f67f65c3a3a663cb8bc47a96cf1551adeaf733d (diff) | |
| download | illumos-joyent-c08b16378bf1d808956fc23b8c8ac30f3172a034.tar.gz | |
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>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zvol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/zvol.c b/usr/src/uts/common/fs/zfs/zvol.c index a59c2a9772..df9a16bccb 100644 --- a/usr/src/uts/common/fs/zfs/zvol.c +++ b/usr/src/uts/common/fs/zfs/zvol.c @@ -1705,9 +1705,9 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *cr, int *rvalp) } 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); |