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

* grub-core/fs/zfs/zfs.c (read_device): Silence spurious warning.

Browse source 
(zfs_unmount): Fix memory leak.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-10-27 20:55:09 +02:00
parent 5773fb6410
commit f8d82408d9
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-10-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/zfs/zfs.c (read_device): Silence spurious warning.
(zfs_unmount): Fix memory leak.
2011-10-26 Vladimir Serbinenko <phcoder@gmail.com> 2011-10-26 Vladimir Serbinenko <phcoder@gmail.com>
Support NTFS reparse points. Support NTFS reparse points.

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

@ -865,7 +865,7 @@ read_device (grub_uint64_t offset, struct grub_zfs_device_desc *desc,
} }
case DEVICE_MIRROR: case DEVICE_MIRROR:
{ {
grub_err_t err; grub_err_t err = GRUB_ERR_NONE;
unsigned i; unsigned i;
if (desc->n_children <= 0) if (desc->n_children <= 0)
return grub_error (GRUB_ERR_BAD_FS, return grub_error (GRUB_ERR_BAD_FS,
@ -2498,6 +2498,7 @@ zfs_unmount (struct grub_zfs_data *data)
unsigned i; unsigned i;
for (i = 0; i < data->n_devices_attached; i++) for (i = 0; i < data->n_devices_attached; i++)
unmount_device (&data->devices_attached[i]); unmount_device (&data->devices_attached[i]);
grub_free (data->devices_attached);
grub_free (data->dnode_buf); grub_free (data->dnode_buf);
grub_free (data->dnode_mdn); grub_free (data->dnode_mdn);
grub_free (data->file_buf); grub_free (data->file_buf);