diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2019-08-15 15:27:58 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2019-08-15 15:27:58 +0000 |
| commit | 5a75f51a1f2aacd8fabbf9b0c9a633607cddf14e (patch) | |
| tree | 2c831fcb9dee239edefe9fc37f1fb534e032fa97 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c | |
| parent | 30f7381b8e69dc369cb5ef90533428706b1d7ec4 (diff) | |
| download | src-5a75f51a1f2aacd8fabbf9b0c9a633607cddf14e.tar.gz src-5a75f51a1f2aacd8fabbf9b0c9a633607cddf14e.zip | |
Revert r351076 and r351074 because of atomic_swap_64 on 32-bit platforms
Trying to sort it out.
Notes
Notes:
svn path=/head/; revision=351077
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c index a801709dcc41..9e905acbcf3b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c @@ -955,8 +955,8 @@ uint64_t zap_create_link_dnsize(objset_t *os, dmu_object_type_t ot, uint64_t parent_obj, const char *name, int dnodesize, dmu_tx_t *tx) { - uint64_t new_obj; - + uint64_t new_obj; + VERIFY((new_obj = zap_create_dnsize(os, ot, DMU_OT_NONE, 0, dnodesize, tx)) > 0); VERIFY0(zap_add(os, parent_obj, name, sizeof (uint64_t), 1, &new_obj, |