Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
This commit is contained in:
commit
cc3579f66a
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue