Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway

diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
index 857b9a343fd2caad443ffc3a280b2c8ce45fcac2..db4890c7b7c215b83d13974c222d0d3ff84fe084 100644 (file)
--- a/module/zfs/dmu_send.c
+++ b/module/zfs/dmu_send.c
@@ -956,6 +956,28 @@ dmu_recv_abort_cleanup(dmu_recv_cookie_t *drc)
        }
 }
 
+/*
+ * Compute checksum of drr_begin record
+ */
+static void
+dmu_recv_stream_cksum(struct restorearg *ra)
+{
+       dmu_replay_record_t *drr;
+
+       drr = kmem_zalloc(sizeof (dmu_replay_record_t), KM_SLEEP);
+
+       drr->drr_type = DRR_BEGIN;
+       drr->drr_u.drr_begin = *drc->drc_drrb;
+       if (ra->byteswap) {
+               fletcher_4_incremental_byteswap(drr,
+                   sizeof (dmu_replay_record_t), &(ra->cksum));
+       } else {
+               fletcher_4_incremental_native(drr,
+                   sizeof (dmu_replay_record_t), &(ra->cksum));
+       }
+       kmem_free(drr, sizeof (dmu_replay_record_t));
+}
+
 /*
  * NB: callers *must* call dmu_recv_end() if this succeeds.
  */
@@ -970,22 +992,7 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, vnode_t *vp, offset_t *voffp)
        if (drc->drc_drrb->drr_magic == BSWAP_64(DMU_BACKUP_MAGIC))
                ra.byteswap = TRUE;
 
-       {
-               /* compute checksum of drr_begin record */
-               dmu_replay_record_t *drr;
-               drr = kmem_zalloc(sizeof (dmu_replay_record_t), KM_SLEEP);
-
-               drr->drr_type = DRR_BEGIN;
-               drr->drr_u.drr_begin = *drc->drc_drrb;
-               if (ra.byteswap) {
-                       fletcher_4_incremental_byteswap(drr,
-                           sizeof (dmu_replay_record_t), &ra.cksum);
-               } else {
-                       fletcher_4_incremental_native(drr,
-                           sizeof (dmu_replay_record_t), &ra.cksum);
-               }
-               kmem_free(drr, sizeof (dmu_replay_record_t));
-       }
+       dmu_recv_stream_cksum(&ra);
 
        if (ra.byteswap) {
                struct drr_begin *drrb = drc->drc_drrb;