diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
index 454bde9590..4e015d3404 100644
--- a/module/zfs/dmu.c
+++ b/module/zfs/dmu.c
@@ -689,7 +689,7 @@ dmu_req_copy(void *arg_buf, int size, int *offset, struct request *req)
 	rq_for_each_segment(bv, req, iter) {
 
 		/* Fully consumed the passed arg_buf */
-		ASSERT3S(offset, <=, size);
+		ASSERT3S(*offset, <=, size);
 		if (size == *offset)
 			break;
 
diff --git a/module/zfs/vdev_raidz.c b/module/zfs/vdev_raidz.c
index c808cf3862..483009d7d0 100644
--- a/module/zfs/vdev_raidz.c
+++ b/module/zfs/vdev_raidz.c
@@ -139,7 +139,7 @@ typedef struct raidz_map {
 	(mask) = (x) & 0x8080808080808080ULL; \
 	(mask) = ((mask) << 1) - ((mask) >> 7); \
 	(x) = (((x) << 1) & 0xfefefefefefefefeULL) ^ \
-	    ((mask) & 0x1d1d1d1d1d1d1d1d); \
+	    ((mask) & 0x1d1d1d1d1d1d1d1dULL); \
 }
 
 #define	VDEV_RAIDZ_64MUL_4(x, mask) \
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index cc95bf2fc2..af64f59349 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -213,7 +213,7 @@ zvol_check_volsize(uint64_t volsize, uint64_t blocksize)
 		return (EINVAL);
 
 #ifdef _ILP32
-	if (volsize - 1 > SPEC_MAXOFFSET_T)
+	if (volsize - 1 > MAXOFFSET_T)
 		return (EOVERFLOW);
 #endif
 	return (0);
@@ -225,6 +225,7 @@ zvol_check_volsize(uint64_t volsize, uint64_t blocksize)
 static int
 zvol_update_volsize(zvol_state_t *zv, uint64_t volsize)
 {
+	struct block_device *bdev;
 	dmu_tx_t *tx;
 	int error;
 
@@ -252,9 +253,16 @@ zvol_update_volsize(zvol_state_t *zv, uint64_t volsize)
 
 	zv->zv_volsize = volsize;
 	zv->zv_changed = 1;
-	error = revalidate_disk(zv->zv_disk);
 
-	return (error);
+	bdev = bdget_disk(zv->zv_disk, 0);
+	if (!bdev)
+		return EIO;
+
+	error = check_disk_change(bdev);
+	ASSERT3U(error, !=, 0);
+	bdput(bdev);
+
+	return (0);
 }
 
 /*