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

Merge commit 'refs/top-bases/linux-arc' into linux-arc

This commit is contained in:
Brian Behlendorf 2008-12-18 13:52:18 -08:00
parent ba1d7d1ee0 433b5c8023
commit 5a52b2f7ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/dmu_send.c
View File

@ -960,7 +960,7 @@ dmu_recv_abort_cleanup(dmu_recv_cookie_t *drc)
* Compute checksum of drr_begin record * Compute checksum of drr_begin record
*/ */
static void static void
dmu_recv_stream_cksum(struct restorearg *ra) dmu_recv_stream_cksum(dmu_recv_cookie_t *drc, struct restorearg *ra)
{ {
dmu_replay_record_t *drr; dmu_replay_record_t *drr;
@ -992,7 +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)) if (drc->drc_drrb->drr_magic == BSWAP_64(DMU_BACKUP_MAGIC))
ra.byteswap = TRUE; ra.byteswap = TRUE;
dmu_recv_stream_cksum(&ra); dmu_recv_stream_cksum(drc, &ra);
if (ra.byteswap) { if (ra.byteswap) {
struct drr_begin *drrb = drc->drc_drrb; struct drr_begin *drrb = drc->drc_drrb;