vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* include/grub/zfs/spa.h (zio_cksum): Add explicit members for mac.

Browse source 
* grub-core/fs/zfs/zfs.c (zio_read): Don't use casts to retrieve mac.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-08-22 16:20:32 +02:00
parent ed7fbf43c2
commit bdb5ba47d8
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/fs/zfs/zfs.c
View file

@ -1871,7 +1871,7 @@ zio_read (blkptr_t *bp, grub_zfs_endian_t endian, void **buf,
err = grub_zfs_decrypt (data->subvol.keyring[besti].cipher,
data->subvol.keyring[besti].algo,
&(bp)->blk_dva[encrypted],
compbuf, psize, ((grub_uint32_t *) &zc + 5),
compbuf, psize, zc.zc_mac,
endian);
}
if (err)