diff options
| author | LOLi <[email protected]> | 2017-05-03 18:31:05 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-05-03 09:31:05 -0700 |
| commit | dddef7d600580ea35177299fe8394f665cc13387 (patch) | |
| tree | 980db4683bb602f8ef7925739517563520d8b357 /cmd/zpool/zpool_vdev.c | |
| parent | 9d3f7b87919b7d0d869153ca72844f565cd0bf52 (diff) | |
More ashift improvements
This commit allow higher ashift values (up to 16) in 'zpool create'
The ashift value was previously limited to 13 (8K block) in b41c990
because the limited number of uberblocks we could fit in the
statically sized (128K) vdev label ring buffer could prevent the
ability the safely roll back a pool to recover it.
Since b02fe35 the largest uberblock size we support is 8K: this
allow us to store a minimum number of 16 uberblocks in the vdev
label, even with higher ashift values.
Additionally change 'ashift' pool property behaviour: if set it will
be used as the default hint value in subsequent vdev operations
('zpool add', 'attach' and 'replace'). A custom ashift value can still
be specified from the command line, if desired.
Finally, fix a bug in add-o_ashift.ksh caused by a missing variable.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #2024
Closes #4205
Closes #4740
Closes #5763
Diffstat (limited to 'cmd/zpool/zpool_vdev.c')
| -rw-r--r-- | cmd/zpool/zpool_vdev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c index c96157eff..d3c281704 100644 --- a/cmd/zpool/zpool_vdev.c +++ b/cmd/zpool/zpool_vdev.c @@ -698,7 +698,11 @@ make_leaf_vdev(nvlist_t *props, const char *arg, uint64_t is_log) if (nvlist_lookup_string(props, zpool_prop_to_name(ZPOOL_PROP_ASHIFT), &value) == 0) { - zfs_nicestrtonum(NULL, value, &ashift); + if (zfs_nicestrtonum(NULL, value, &ashift) != 0) { + (void) fprintf(stderr, + gettext("ashift must be a number.\n")); + return (NULL); + } if (ashift != 0 && (ashift < ASHIFT_MIN || ashift > ASHIFT_MAX)) { (void) fprintf(stderr, |