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().

diff --git a/ChangeLog b/ChangeLog
index e3d4b70052a772c1d9938907a71ce4fa5cb76cc1..bdf846cef9a2db881911e18d0d329b0a0410d70d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/disk/fs_uuid.c b/disk/fs_uuid.c
index 9636ce9d3b5d0890f041760b070c130cbff041e0..e9888a7e360e93e127fe40716fdb039196748459 100644 (file)
--- a/disk/fs_uuid.c
+++ b/disk/fs_uuid.c
@@ -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 =