Revision: 2147
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2147
Author: proski
Date: 2009-04-28 13:23:38 +0000 (Tue, 28 Apr 2009)
Log Message:
-----------
2009-04-28 Pavel Roskin <[email protected]>
* 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().
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/disk/fs_uuid.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-04-28 13:14:20 UTC (rev 2146)
+++ trunk/grub2/ChangeLog 2009-04-28 13:23:38 UTC (rev 2147)
@@ -1,5 +1,10 @@
2009-04-28 Pavel Roskin <[email protected]>
+ * 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.
Modified: trunk/grub2/disk/fs_uuid.c
===================================================================
--- trunk/grub2/disk/fs_uuid.c 2009-04-28 13:14:20 UTC (rev 2146)
+++ trunk/grub2/disk/fs_uuid.c 2009-04-28 13:23:38 UTC (rev 2147)
@@ -99,7 +99,7 @@
else
disk->partition = NULL;
- disk->data = dev->disk;
+ disk->data = dev;
return GRUB_ERR_NONE;
}
@@ -107,24 +107,24 @@
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 =
