diff options
| author | timh <none@none> | 2007-11-26 17:57:43 -0800 |
|---|---|---|
| committer | timh <none@none> | 2007-11-26 17:57:43 -0800 |
| commit | b3d911cb99b7e5dd9df4c81fd7b58a97c82d07db (patch) | |
| tree | ae72aea02909fab7f979cfafceed90e60e867269 /usr/src | |
| parent | 8100efacfab0b6f34c0700fc9bf20aba0cc6ff93 (diff) | |
| download | illumos-joyent-b3d911cb99b7e5dd9df4c81fd7b58a97c82d07db.tar.gz | |
6633610 cannot successfully 'zpool create' on non-debug bits after 6622831
Contributed by Juergen Keil
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_znode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_znode.c b/usr/src/uts/common/fs/zfs/zfs_znode.c index 01b4a2318b..ff3087a444 100644 --- a/usr/src/uts/common/fs/zfs/zfs_znode.c +++ b/usr/src/uts/common/fs/zfs/zfs_znode.c @@ -293,7 +293,7 @@ zfs_init_fs(zfsvfs_t *zfsvfs, znode_t **zpp, cred_t *cr) return (error); } else if (zfsvfs->z_version > ZPL_VERSION) { (void) printf("Mismatched versions: File system " - "is version %lld on-disk format, which is " + "is version %llu on-disk format, which is " "incompatible with this software version %lld!", (u_longlong_t)zfsvfs->z_version, ZPL_VERSION); return (ENOTSUP); @@ -1231,7 +1231,7 @@ zfs_create_fs(objset_t *os, cred_t *cr, nvlist_t *zplprops, dmu_tx_t *tx) char *name; ASSERT(nvpair_type(elem) == DATA_TYPE_UINT64); - ASSERT(nvpair_value_uint64(elem, &val) == 0); + VERIFY(nvpair_value_uint64(elem, &val) == 0); name = nvpair_name(elem); if (strcmp(name, zfs_prop_to_name(ZFS_PROP_VERSION)) == 0) { version = val; |