diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2014-11-17 14:16:02 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2014-11-17 14:16:02 +0000 |
| commit | 0908b20b7ee1d0e8f1628e137fe13ee3e85c2826 (patch) | |
| tree | ce0697f27fe7ec94e80e809c15fbc54c227849a9 | |
| parent | ff0ba87247820afbdfdc1b307c803f7923d0e4d3 (diff) | |
| download | src-0908b20b7ee1d0e8f1628e137fe13ee3e85c2826.tar.gz src-0908b20b7ee1d0e8f1628e137fe13ee3e85c2826.zip | |
Revert r269093 which introduced physical zio alignment transform
Size of physical ZIOs must never be implicitly adjusted, it's
a responsibility of a caller to make sure that such a ZIO has proper offset
and size.
Discussed with: delphij, gibbs
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=274627
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c index c06ad57bde3c..70ee9a6a1cb7 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c @@ -2619,8 +2619,7 @@ zio_vdev_io_start(zio_t *zio) align = 1ULL << vd->vdev_top->vdev_ashift; - if ((!(zio->io_flags & ZIO_FLAG_PHYSICAL) || - (vd->vdev_top->vdev_physical_ashift > SPA_MINBLOCKSHIFT)) && + if (!(zio->io_flags & ZIO_FLAG_PHYSICAL) && P2PHASE(zio->io_size, align) != 0) { /* Transform logical writes to be a full physical block size. */ uint64_t asize = P2ROUNDUP(zio->io_size, align); |