svn commit: r216230 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Pawel Jakub Dawidek]

On Mon, Dec 06, 2010 at 12:18:03PM +0000, Ivan Voras wrote:
> Author: ivoras
> Date: Mon Dec  6 12:18:02 2010
> New Revision: 216230
> URL: http://svn.freebsd.org/changeset/base/216230
> 
> Log:
>   Use GEOM stripesize field when calculating ashift. This will enable correct
>   alignment on drives with large sector sizes (e.g. 4 KiB) but the
>   implementation might need to be revisited if devices with large stripesizes
>   appear (e.g. if RAID controllers or flash drives start using the field),
>   probably by introducing a physsectorsize field in GEOM providers.

Please back this out as soon as possible!

>   Discussed with: mav, mostly silence on freebsd-geom@ and freebsd-fs@

Guess why it wasn't picked up by anyone?

> Modified:
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
> 
> Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
> ==============================================================================
> --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Mon Dec  6 11:37:24 2010	(r216229)
> +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Mon Dec  6 12:18:02 2010	(r216230)
> @@ -496,7 +496,10 @@ vdev_geom_open(vdev_t *vd, uint64_t *psi
>  	/*
>  	 * Determine the device's minimum transfer size.
>  	 */
> -	*ashift = highbit(MAX(pp->sectorsize, SPA_MINBLOCKSIZE)) - 1;
> +	if (pp->stripesize > pp->sectorsize)
> +		*ashift = highbit(MIN(pp->stripesize, SPA_MAXBLOCKSIZE)) - 1;
> +	else
> +		*ashift = highbit(MAX(pp->sectorsize, SPA_MINBLOCKSIZE)) - 1;

Even in this chunk there is a comment explaining perfectly what ashift
stands for!!

-- 
Pawel Jakub Dawidek                       http://www.wheelsystems.com
pjd at FreeBSD.org                           http://www.FreeBSD.org
FreeBSD committer                         Am I Evil? Yes, I Am!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20101206/d3ec8949/attachment.pgp