diff options
| author | ivoras <ivoras@FreeBSD.org> | 2010-12-07 15:24:08 +0000 |
|---|---|---|
| committer | ivoras <ivoras@FreeBSD.org> | 2010-12-07 15:24:08 +0000 |
| commit | 936441dc0734e8fabe90edc75b0a85c0112000ac (patch) | |
| tree | c6a0748c277e5d7eae77cb0ebf0d63541b200a40 /sys/cddl/contrib | |
| parent | 2c234bfed65d90a8d6c58495d0819be4eaf52fc5 (diff) | |
| download | FreeBSD-src-936441dc0734e8fabe90edc75b0a85c0112000ac.zip FreeBSD-src-936441dc0734e8fabe90edc75b0a85c0112000ac.tar.gz | |
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
Diffstat (limited to 'sys/cddl/contrib')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | 5 |
1 files changed, 1 insertions, 4 deletions
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 |
