X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzio.c;h=ace72a0875be7db5dad1427c0bc6a3e2186e9d93;hb=82f46731fd5a9eef4f87530e94922664b58a6138;hp=fe2bdc867fea6151d2b0177e8dbd34796804eeca;hpb=86dd0fd9222b6103c6533036c47b908ece944460;p=zfs.git

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index fe2bdc8..ace72a0 100644
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -259,7 +259,7 @@ zio_buf_alloc(size_t size)
 
 	ASSERT(c < SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT);
 
-	return (kmem_cache_alloc(zio_buf_cache[c], KM_PUSHPAGE));
+	return (kmem_cache_alloc(zio_buf_cache[c], KM_PUSHPAGE | KM_NODEBUG));
 }
 
 /*
@@ -275,7 +275,8 @@ zio_data_buf_alloc(size_t size)
 
 	ASSERT(c < SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT);
 
-	return (kmem_cache_alloc(zio_data_buf_cache[c], KM_PUSHPAGE));
+	return (kmem_cache_alloc(zio_data_buf_cache[c],
+	    KM_PUSHPAGE | KM_NODEBUG));
 }
 
 void
@@ -2431,19 +2432,25 @@ zio_vdev_io_start(zio_t *zio)
 
 	align = 1ULL << vd->vdev_top->vdev_ashift;
 
-	if (P2PHASE(zio->io_size, align) != 0) {
+	/*
+	 * On Linux, we don't care about read alignment. The backing block
+	 * device driver will take care of that for us.
+	 * The only exception is raidz, which needs a full block for parity.
+	 */
+	if (P2PHASE(zio->io_size, align) != 0 &&
+	    (zio->io_type != ZIO_TYPE_READ ||
+	     vd->vdev_ops == &vdev_raidz_ops)) {
 		uint64_t asize = P2ROUNDUP(zio->io_size, align);
 		char *abuf = zio_buf_alloc(asize);
-		ASSERT(vd == vd->vdev_top);
 		if (zio->io_type == ZIO_TYPE_WRITE) {
 			bcopy(zio->io_data, abuf, zio->io_size);
 			bzero(abuf + zio->io_size, asize - zio->io_size);
 		}
 		zio_push_transform(zio, abuf, asize, asize, zio_subblock);
+		ASSERT(P2PHASE(zio->io_size, align) == 0);
 	}
 
 	ASSERT(P2PHASE(zio->io_offset, align) == 0);
-	ASSERT(P2PHASE(zio->io_size, align) == 0);
 	VERIFY(zio->io_type != ZIO_TYPE_WRITE || spa_writeable(spa));
 
 	/*