git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set RPM_DEFINE_COMMON options
[zfs.git]
/
module
/
zfs
/
vdev.c
diff --git
a/module/zfs/vdev.c
b/module/zfs/vdev.c
index
06097f3
..
afff4d4
100644
(file)
--- a/
module/zfs/vdev.c
+++ b/
module/zfs/vdev.c
@@
-1258,11
+1258,12
@@
vdev_open(vdev_t *vd)
if (vd->vdev_asize == 0) {
/*
* This is the first-ever open, so use the computed values.
if (vd->vdev_asize == 0) {
/*
* This is the first-ever open, so use the computed values.
- * For
testing purposes, a higher
ashift can be requested.
+ * For
compatibility, a different
ashift can be requested.
*/
vd->vdev_asize = asize;
vd->vdev_max_asize = max_asize;
*/
vd->vdev_asize = asize;
vd->vdev_max_asize = max_asize;
- vd->vdev_ashift = MAX(ashift, vd->vdev_ashift);
+ if (vd->vdev_ashift == 0)
+ vd->vdev_ashift = ashift;
} else {
/*
* Detect if the alignment requirement has increased.
} else {
/*
* Detect if the alignment requirement has increased.