Date: Mon, 17 Nov 2014 14:16:02 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274627 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201411171416.sAHEG2af082722@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Mon Nov 17 14:16:02 2014 New Revision: 274627 URL: https://svnweb.freebsd.org/changeset/base/274627 Log: 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 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Mon Nov 17 13:39:00 2014 (r274626) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Mon Nov 17 14:16:02 2014 (r274627) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411171416.sAHEG2af082722>