diff options
| author | John Levon <john.levon@joyent.com> | 2020-04-27 12:13:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 12:13:35 +0100 |
| commit | 6fcbeecca7f56c616db6edcc081a5ad4fea1ac05 (patch) | |
| tree | 64e2369c2120a6098fd184d78494ce5c6af48a32 /usr/src/uts/common/fs/zfs/zvol.c | |
| parent | 6b8372c7be33da3e049ec99ed01e05fc957aa76c (diff) | |
| parent | 31f2b09b95899b5b69759d52e8abc6cf122d0e74 (diff) | |
| download | illumos-joyent-6fcbeecca7f56c616db6edcc081a5ad4fea1ac05.tar.gz | |
Merge branch 'master' into OS-8161OS-8161
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zvol.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zvol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/zvol.c b/usr/src/uts/common/fs/zfs/zvol.c index 3ed5977c20..2e684a5ff0 100644 --- a/usr/src/uts/common/fs/zfs/zvol.c +++ b/usr/src/uts/common/fs/zfs/zvol.c @@ -24,7 +24,7 @@ * Portions Copyright 2010 Robert Milkowski * * Copyright 2017 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012, 2017 by Delphix. All rights reserved. + * Copyright (c) 2012, 2020 by Delphix. All rights reserved. * Copyright (c) 2014 Integros [integros.com] * Copyright 2019 Joyent, Inc. */ @@ -1499,7 +1499,7 @@ zvol_write(dev_t dev, uio_t *uio, cred_t *cr) bytes = volsize - off; tot_bytes += bytes; - dmu_tx_hold_write(tx, ZVOL_OBJ, off, bytes); + dmu_tx_hold_write_by_dnode(tx, zv->zv_dn, off, bytes); error = dmu_tx_assign(tx, TXG_WAIT); if (error) { dmu_tx_abort(tx); |