Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-25 00:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small cleanup

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2011-11-06 21:08:32 +01:00
1 parent bc1de0bc26
commit ae9a20d973
1 file changed
+1 -3
Download Patch File Download Diff File Expand all files Collapse all files
grub-core/fs/zfs/zfs.c
+1 -3
View File
@@ -1479,6 +1479,7 @@ zio_read (blkptr_t *bp, grub_zfs_endian_t endian, void **buf,
if (comp != ZIO_COMPRESS_OFF) if (comp != ZIO_COMPRESS_OFF)
{ {
/* It's not really necessary to align to 16, just for safety. */
compbuf = grub_malloc (ALIGN_UP (psize, 16)); compbuf = grub_malloc (ALIGN_UP (psize, 16));
if (! compbuf) if (! compbuf)
return grub_errno; return grub_errno;
@@ -1878,9 +1879,6 @@ zap_verify (zap_phys_t *zap, grub_zfs_endian_t endian)
if (grub_zfs_to_cpu64 (zap->zap_magic, endian) != (grub_uint64_t) ZAP_MAGIC) if (grub_zfs_to_cpu64 (zap->zap_magic, endian) != (grub_uint64_t) ZAP_MAGIC)
return grub_error (GRUB_ERR_BAD_FS, "bad ZAP magic"); return grub_error (GRUB_ERR_BAD_FS, "bad ZAP magic");
/* if (zap->zap_flags != 0)
return grub_error (GRUB_ERR_BAD_FS, "bad ZAP flags");*/
if (zap->zap_salt == 0) if (zap->zap_salt == 0)
return grub_error (GRUB_ERR_BAD_FS, "bad ZAP salt"); return grub_error (GRUB_ERR_BAD_FS, "bad ZAP salt");