]> git.proxmox.com Git - mirror_zfs.git/commitdiff
DMU: Fix lock leak on dbuf_hold() error
authorAlexander Motin <mav@FreeBSD.org>
Sat, 9 Dec 2023 00:43:39 +0000 (19:43 -0500)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 9 Jan 2024 00:11:39 +0000 (16:11 -0800)
dmu_assign_arcbuf_by_dnode() should drop dn_struct_rwlock lock in
case dbuf_hold() failed.  I don't have reproduction for this, but
it looks inconsistent with dmu_buf_hold_noread_by_dnode() and co.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Alexander Motin <mav@FreeBSD.org>
Sponsored by: iXsystems, Inc.
Closes #15644

module/zfs/dmu.c

index 63464d747428636a44b511292f74881fd53ad3b3..909605aa264ebed3724fbadd9e8933480ad9d35e 100644 (file)
@@ -1482,9 +1482,9 @@ dmu_assign_arcbuf_by_dnode(dnode_t *dn, uint64_t offset, arc_buf_t *buf,
        rw_enter(&dn->dn_struct_rwlock, RW_READER);
        blkid = dbuf_whichblock(dn, 0, offset);
        db = dbuf_hold(dn, blkid, FTAG);
+       rw_exit(&dn->dn_struct_rwlock);
        if (db == NULL)
                return (SET_ERROR(EIO));
-       rw_exit(&dn->dn_struct_rwlock);
 
        /*
         * We can only assign if the offset is aligned and the arc buf is the