diff options
| author | delphij <delphij@FreeBSD.org> | 2014-03-19 23:36:12 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-03-19 23:36:12 +0000 |
| commit | 5b9b9ced5021655cfea1938e478c1a00a7301d5d (patch) | |
| tree | fd61225d2df2d7a6be396c0d8f12265aed4a6e87 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c | |
| parent | b7ccc923c2cefa127943f10a6c5634b75c980a79 (diff) | |
| download | FreeBSD-src-5b9b9ced5021655cfea1938e478c1a00a7301d5d.zip FreeBSD-src-5b9b9ced5021655cfea1938e478c1a00a7301d5d.tar.gz | |
MFC r259813 + r259813: MFV r258374:
4171 clean up spa_feature_*() interfaces
4172 implement extensible_dataset feature for use by other zpool
features
illumos/illumos-gate@2acef22db7808606888f8f92715629ff3ba555b9
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c index 47356c2..c660f23 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c @@ -583,7 +583,7 @@ mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags) return (err); } -static void +void mzap_create_impl(objset_t *os, uint64_t obj, int normflags, zap_flags_t flags, dmu_tx_t *tx) { @@ -873,8 +873,8 @@ zap_lookup_uint64(objset_t *os, uint64_t zapobj, const uint64_t *key, int zap_contains(objset_t *os, uint64_t zapobj, const char *name) { - int err = (zap_lookup_norm(os, zapobj, name, 0, - 0, NULL, MT_EXACT, NULL, 0, NULL)); + int err = zap_lookup_norm(os, zapobj, name, 0, + 0, NULL, MT_EXACT, NULL, 0, NULL); if (err == EOVERFLOW || err == EINVAL) err = 0; /* found, but skipped reading the value */ return (err); |
