Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Revert Rev. 1.31 ...



details:   https://anonhg.NetBSD.org/src/rev/7da5e2597e08
branches:  trunk
changeset: 971868:7da5e2597e08
user:      hannken <hannken%NetBSD.org@localhost>
date:      Thu May 07 09:12:31 2020 +0000

description:
Revert Rev. 1.31 as it is no longer possible for the handle to be NULL.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (16 lines):

diff -r d4bdb995c41a -r 7da5e2597e08 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c    Thu May 07 09:12:03 2020 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c    Thu May 07 09:12:31 2020 +0000
@@ -1315,11 +1315,7 @@
                return (SET_ERROR(EINVAL));
        }
        hdl = dmu_buf_get_user(db);
-       if (hdl == NULL) {
-               sa_buf_rele(db, NULL);
-               ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
-               return (SET_ERROR(EINVAL));
-       }
+       ASSERT3P(hdl, !=, NULL);
        zp = sa_get_userdata(hdl);
        ASSERT3U(zp->z_id, ==, obj_num);
        sa_buf_rele(db, NULL);



Home | Main Index | Thread Index | Old Index