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

2009-04-28 Pavel Roskin <proski@gnu.org>

Browse source 
* disk/fs_uuid.c (grub_fs_uuid_open): Use parent->data for dev,
	not disk.  Adjust all dependencies.
	(grub_device_close): Use grub_device_close(), not
	grub_disk_close().
This commit is contained in:
proski 2009-04-28 13:23:38 +00:00
parent 136d9f8283
commit 9459c3067c
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2009-04-28 Pavel Roskin <proski@gnu.org>
* disk/fs_uuid.c (grub_fs_uuid_open): Use parent->data for dev,
not disk. Adjust all dependencies.
(grub_device_close): Use grub_device_close(), not
grub_disk_close().
* disk/fs_uuid.c (grub_fs_uuid_open): Allocate memory to copy
parent's partition, don't copy it by reference, as it gets freed
on close.

14
disk/fs_uuid.c
View file

@ -99,7 +99,7 @@ grub_fs_uuid_open (const char *name, grub_disk_t disk)
else
disk->partition = NULL;
disk->data = dev->disk;
disk->data = dev;
return GRUB_ERR_NONE;
}
@ -107,24 +107,24 @@ grub_fs_uuid_open (const char *name, grub_disk_t disk)
static void
grub_fs_uuid_close (grub_disk_t disk __attribute((unused)))
{
grub_disk_t parent = disk->data;
grub_disk_close (parent);
grub_device_t parent = disk->data;
grub_device_close (parent);
}
static grub_err_t
grub_fs_uuid_read (grub_disk_t disk, grub_disk_addr_t sector,
grub_size_t size, char *buf)
{
grub_disk_t parent = disk->data;
return parent->dev->read (parent, sector, size, buf);
grub_device_t parent = disk->data;
return parent->disk->dev->read (parent->disk, sector, size, buf);
}
static grub_err_t
grub_fs_uuid_write (grub_disk_t disk, grub_disk_addr_t sector,
grub_size_t size, const char *buf)
{
grub_disk_t parent = disk->data;
return parent->dev->write (parent, sector, size, buf);
grub_device_t parent = disk->data;
return parent->disk->dev->write (parent->disk, sector, size, buf);
}
static struct grub_disk_dev grub_fs_uuid_dev =