Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Don't call arc_buf_destroy on unallocated arc_buf 

Fixes an obvious issue of calling arc_buf_destroy() on an
unallocated arc_buf.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Matt Ahrens <matt@delphix.com>
Reviewed-by: Paul Dagnelie <pcd@delphix.com>
Signed-off-by: Chris Dunlop <chris@onthe.net.au>
Closes #9453
This commit is contained in:
chrisrd 2019-10-24 09:26:17 +11:00 committed by Brian Behlendorf
parent 64b2e7d7ec
commit 05d07ba9a7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
module/zfs/dmu_send.c
View File

@ -924,6 +924,7 @@ do_dump(dmu_send_cookie_t *dscp, struct send_range *range)
blkptr_t *bp = &srdp->bp; blkptr_t *bp = &srdp->bp;
spa_t *spa = spa_t *spa =
dmu_objset_spa(dscp->dsc_os); dmu_objset_spa(dscp->dsc_os);
arc_buf_t *abuf = NULL;
ASSERT3U(srdp->datablksz, ==, BP_GET_LSIZE(bp)); ASSERT3U(srdp->datablksz, ==, BP_GET_LSIZE(bp));
ASSERT3U(range->start_blkid + 1, ==, range->end_blkid); ASSERT3U(range->start_blkid + 1, ==, range->end_blkid);
@ -936,7 +937,6 @@ do_dump(dmu_send_cookie_t *dscp, struct send_range *range)
zioflags |= ZIO_FLAG_RAW; zioflags |= ZIO_FLAG_RAW;
} }
arc_buf_t *abuf;
zbookmark_phys_t zb; zbookmark_phys_t zb;
ASSERT3U(range->start_blkid, ==, DMU_SPILL_BLKID); ASSERT3U(range->start_blkid, ==, DMU_SPILL_BLKID);
zb.zb_objset = dmu_objset_id(dscp->dsc_os); zb.zb_objset = dmu_objset_id(dscp->dsc_os);
@ -949,8 +949,10 @@ do_dump(dmu_send_cookie_t *dscp, struct send_range *range)
zioflags, &aflags, &zb) != 0) zioflags, &aflags, &zb) != 0)
return (SET_ERROR(EIO)); return (SET_ERROR(EIO));
err = dump_spill(dscp, bp, zb.zb_object, abuf->b_data); err = dump_spill(dscp, bp, zb.zb_object,
arc_buf_destroy(abuf, &abuf); (abuf == NULL ? NULL : abuf->b_data));
if (abuf != NULL)
arc_buf_destroy(abuf, &abuf);
return (err); return (err);
} }
if (send_do_embed(dscp, bp)) { if (send_do_embed(dscp, bp)) {
@ -965,7 +967,6 @@ do_dump(dmu_send_cookie_t *dscp, struct send_range *range)
dscp->dsc_resume_offset)); dscp->dsc_resume_offset));
/* it's a level-0 block of a regular object */ /* it's a level-0 block of a regular object */
arc_flags_t aflags = ARC_FLAG_WAIT; arc_flags_t aflags = ARC_FLAG_WAIT;
arc_buf_t *abuf = NULL;
uint64_t offset; uint64_t offset;
/* /*