diff options
| author | Xin LI <delphij@FreeBSD.org> | 2013-07-18 00:22:42 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2013-07-18 00:22:42 +0000 |
| commit | c92bc5e996359076a73118d8d2f2b93e5283713d (patch) | |
| tree | 395a08ac4a6de6a3c04bd36bbf5eac5fd17a289f /cddl | |
| parent | ba41c3c13f65914be1edb646ff53441078d59815 (diff) | |
| download | src-c92bc5e996359076a73118d8d2f2b93e5283713d.tar.gz src-c92bc5e996359076a73118d8d2f2b93e5283713d.zip | |
Manually merge part of vendor import r238583 from Illumos.
Illumos changeset: 13680:2bd022a765e2
Illumos ZFS issue:
2671 zpool import should not fail if vdev ashift has increased
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=253441
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c index 5b24a2f5feb3..bfb71145516e 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c @@ -3997,7 +3997,7 @@ print_dedup_stats(nvlist_t *config) /* * If the pool was faulted then we may not have been able to - * obtain the config. Otherwise, if have anything in the dedup + * obtain the config. Otherwise, if we have anything in the dedup * table continue processing the stats. */ if (nvlist_lookup_uint64_array(config, ZPOOL_CONFIG_DDT_OBJ_STATS, |