From 936441dc0734e8fabe90edc75b0a85c0112000ac Mon Sep 17 00:00:00 2001 From: ivoras Date: Tue, 7 Dec 2010 15:24:08 +0000 Subject: 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 --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c index 36550a5..d0d5137 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c @@ -496,10 +496,7 @@ vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *ashift) /* * 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 -- cgit v1.1