diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2015-06-12 10:57:05 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2015-06-12 10:57:05 +0000 |
| commit | ff7e06fbf494fc0ae19f6d243c30b60b89463e04 (patch) | |
| tree | 2a8eab54f670bdeec05b0eb17765dd922357412f /cddl | |
| parent | 8e9f0d5803db6da50c3880445be7d095eabac4bf (diff) | |
| parent | cd7e9ce6ffa5db180c6c4fcca83b5784bce0731d (diff) | |
| download | src-ff7e06fbf494fc0ae19f6d243c30b60b89463e04.tar.gz src-ff7e06fbf494fc0ae19f6d243c30b60b89463e04.zip | |
MFV r284030: 5818 zfs {ref}compressratio is incorrect with 4k sector size
illumos/illumos-gate@81cd5c555f505484180a62ca5a2fbb00d70c57d6
Author: Matthew Ahrens <mahrens@delphix.com>
MFC after: 17 days
Notes
Notes:
svn path=/head/; revision=284304
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/ztest/ztest.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/cddl/contrib/opensolaris/cmd/ztest/ztest.c b/cddl/contrib/opensolaris/cmd/ztest/ztest.c index ab69154b8d19..069583495e44 100644 --- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c +++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2014 by Delphix. All rights reserved. + * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. @@ -969,21 +969,6 @@ ztest_random_spa_version(uint64_t initial_version) return (version); } -/* - * Find the largest ashift used - */ -static uint64_t -ztest_spa_get_ashift() { - uint64_t i; - uint64_t ashift = SPA_MINBLOCKSHIFT; - vdev_t *rvd = ztest_spa->spa_root_vdev; - - for (i = 0; i < rvd->vdev_children; i++) { - ashift = MAX(ashift, rvd->vdev_child[i]->vdev_ashift); - } - return (ashift); -} - static int ztest_random_blocksize(void) { @@ -995,7 +980,7 @@ ztest_random_blocksize(void) int maxbs = SPA_OLD_MAXBLOCKSHIFT; if (spa_maxblocksize(ztest_spa) == SPA_MAXBLOCKSIZE) maxbs = 20; - block_shift = ztest_random(maxbs - ztest_spa_get_ashift() + 1); + block_shift = ztest_random(maxbs - ztest_spa->spa_max_ashift + 1); return (1 << (SPA_MINBLOCKSHIFT + block_shift)); } |