svn commit: r297085 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Sun Mar 20 20:37:26 2016
New Revision: 297085
URL: https://svnweb.freebsd.org/changeset/base/297085

Log:
  MFC r274627 (by avg):
  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

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Sun Mar 20 20:33:03 2016	(r297084)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Sun Mar 20 20:37:26 2016	(r297085)
@@ -2727,8 +2727,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);