OpenZFS 7256 - low probability race in zfs_get_data

Authored by: Andriy Gapon <andriy.gapon@clusterhq.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>
OpenZFS-issue: https://www.illumos.org/issues/7256
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/6ed18a8
Closes #5601

diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index 3509238d17073e5c7349dbca4638c91ca5b748df..7344c9a80cf2c1139ed011b5f023ecf16f6395ab 100644 (file)
--- 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