Author: ivoras
Date: Tue Dec 7 15:24:08 2010
New Revision: 216256
URL: http://svn.freebsd.org/changeset/base/216256
Log:
Undo r216230: the interaction between saved ashift in metadata and
detected ashift does not support this. With this change, pools
created while stripesize=512 could not be imported when stripesize
becomes larger (on the same drive).
Noticed by: pjd
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 Tue Dec
7 12:44:33 2010 (r216255)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Tue Dec
7 15:24:08 2010 (r216256)
@@ -496,10 +496,7 @@ vdev_geom_open(vdev_t *vd, uint64_t *psi
/*
* Determine the device's minimum transfer size.
*/
- if (pp->stripesize > pp->sectorsize)
- *ashift = highbit(MIN(pp->stripesize, SPA_MAXBLOCKSIZE)) - 1;
- else
- *ashift = highbit(MAX(pp->sectorsize, SPA_MINBLOCKSIZE)) - 1;
+ *ashift = highbit(MAX(pp->sectorsize, SPA_MINBLOCKSIZE)) - 1;
/*
* Clear the nowritecache bit, so that on a vdev_reopen() we will
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
