diff options
author | George Melikov <[email protected]> | 2017-01-18 02:18:59 +0300 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2017-01-17 15:18:59 -0800 |
commit | 61ca48ff382b56894ec4b6fa9aeba60c278512b1 (patch) | |
tree | 20e284926328faf2ca58bee7b939b3f98864710c /module/zfs | |
parent | e88551d52f0490578ec6d2aa2c36563dfdbdd3b3 (diff) |
OpenZFS 7256 - low probability race in zfs_get_data
Authored by: Andriy Gapon <[email protected]>
Reviewed by: Matt Ahrens <[email protected]>
Reviewed by: Pavel Zakharov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: George Melikov <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/7256
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/6ed18a8
Closes #5601
Diffstat (limited to 'module/zfs')
-rw-r--r-- | module/zfs/zfs_vnops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c index 3509238d1..7344c9a80 100644 --- a/module/zfs/zfs_vnops.c +++ b/module/zfs/zfs_vnops.c @@ -1086,7 +1086,7 @@ zfs_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio) error = dmu_sync(zio, lr->lr_common.lrc_txg, zfs_get_done, zgd); - ASSERT(error || lr->lr_length <= zp->z_blksz); + ASSERT(error || lr->lr_length <= size); /* * On success, we need to wait for the write I/O |