From 0ddc619999a799152c6fb5e81653bbef2a19a1d5 Mon Sep 17 00:00:00 2001

From: Colin Watson <cjwatson@ubuntu.com>

Date: Wed, 27 Feb 2013 17:19:15 +0100

Subject: [PATCH 162/482] 	Remove nested functions from disk and file

 read hooks.

	* include/grub/disk.h (grub_disk_read_hook_t): New type.

	(struct grub_disk): Add read_hook_data member.

	* include/grub/file.h (struct grub_file): Likewise.

	* include/grub/fshelp.h (grub_fshelp_read_file): Add read_hook_data

	argument.

	Update all callers.

---

 ChangeLog                      |  12 +++

 config.h.in                    |   6 +-

 grub-core/commands/blocklist.c | 106 ++++++++++++---------

 grub-core/commands/loadenv.c   |  80 +++++++++-------

 grub-core/commands/testload.c  |  22 +++--

 grub-core/fs/affs.c            |   2 +-

 grub-core/fs/bfs.c             |  41 ++++----

 grub-core/fs/ext2.c            |  15 +--

 grub-core/fs/fat.c             |  15 +--

 grub-core/fs/fshelp.c          |  10 +-

 grub-core/fs/hfs.c             |   7 +-

 grub-core/fs/hfsplus.c         |  23 ++---

 grub-core/fs/iso9660.c         |   1 +

 grub-core/fs/jfs.c             |   9 +-

 grub-core/fs/minix.c           |  17 ++--

 grub-core/fs/nilfs2.c          |  17 ++--

 grub-core/fs/ntfs.c            |  48 ++++------

 grub-core/fs/ntfscomp.c        |   1 +

 grub-core/fs/reiserfs.c        |  15 ++-

 grub-core/fs/romfs.c           |   1 +

 grub-core/fs/sfs.c             |   9 +-

 grub-core/fs/udf.c             |  22 ++---

 grub-core/fs/ufs.c             |  17 ++--

 grub-core/fs/xfs.c             |  15 +--

 grub-core/kern/disk.c          |   2 +-

 include/grub/disk.h            |  12 ++-

 include/grub/file.h            |   7 +-

 include/grub/fshelp.h          |   6 +-

 util/grub-setup.c              | 210 +++++++++++++++++++++--------------------

 29 files changed, 406 insertions(+), 342 deletions(-)

diff --git a/ChangeLog b/ChangeLog

index c77a6a6..dbecfef 100644

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,15 @@

+2013-02-27  Colin Watson  <cjwatson@ubuntu.com>

+

+	Remove nested functions from disk and file read hooks.

+

+	* include/grub/disk.h (grub_disk_read_hook_t): New type.

+	(struct grub_disk): Add read_hook_data member.

+	* include/grub/file.h (struct grub_file): Likewise.

+	* include/grub/fshelp.h (grub_fshelp_read_file): Add read_hook_data

+	argument.

+

+	Update all callers.

+

 2012-02-27  Andrey Borzenkov <arvidjaar@gmail.com>

 	* grub-core/partmap/msdos.c (grub_partition_msdos_iterate):

diff --git a/config.h.in b/config.h.in

index a7eaf19..91afd98 100644

--- a/config.h.in

+++ b/config.h.in

@@ -5,6 +5,10 @@

 #if defined(__PPC__) && !defined(__powerpc__)

 #define __powerpc__ 1

 #endif

+

+/* Define to 1 to enable disk cache statistics.  */

+#define DISK_CACHE_STATS @DISK_CACHE_STATS@

+

 #if defined (GRUB_UTIL) || !defined (GRUB_MACHINE)

 #include <config-util.h>

 #define NESTED_FUNC_ATTR

@@ -39,8 +43,6 @@

 #define NEED_ENABLE_EXECUTE_STACK @NEED_ENABLE_EXECUTE_STACK@

 /* Define to 1 if GCC generates calls to __register_frame_info().  */

 #define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@

-/* Define to 1 to enable disk cache statistics.  */

-#define DISK_CACHE_STATS @DISK_CACHE_STATS@

 #define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"

 #define GRUB_PLATFORM "@GRUB_PLATFORM@"

diff --git a/grub-core/commands/blocklist.c b/grub-core/commands/blocklist.c

index 164a6fe..c531e44 100644

--- a/grub-core/commands/blocklist.c

+++ b/grub-core/commands/blocklist.c

@@ -28,58 +28,71 @@

 GRUB_MOD_LICENSE ("GPLv3+");

-static grub_err_t

-grub_cmd_blocklist (grub_command_t cmd __attribute__ ((unused)),

-		    int argc, char **args)

+/* Context for grub_cmd_blocklist.  */

+struct blocklist_ctx

 {

-  grub_file_t file;

-  char buf[GRUB_DISK_SECTOR_SIZE];

-  unsigned long start_sector = 0;

-  unsigned num_sectors = 0;

-  int num_entries = 0;

-  grub_disk_addr_t part_start = 0;

-  auto void NESTED_FUNC_ATTR read_blocklist (grub_disk_addr_t sector, unsigned offset,

-			    unsigned length);

-  auto void NESTED_FUNC_ATTR print_blocklist (grub_disk_addr_t sector, unsigned num,

-			     unsigned offset, unsigned length);

-

-  void NESTED_FUNC_ATTR read_blocklist (grub_disk_addr_t sector, unsigned offset,

-		       unsigned length)

+  unsigned long start_sector;

+  unsigned num_sectors;

+  int num_entries;

+  grub_disk_addr_t part_start;

+};

+

+/* Helper for grub_cmd_blocklist.  */

+static void

+print_blocklist (grub_disk_addr_t sector, unsigned num,

+		 unsigned offset, unsigned length, struct blocklist_ctx *ctx)

+{

+  if (ctx->num_entries++)

+    grub_printf (",");

+

+  grub_printf ("%llu", (unsigned long long) (sector - ctx->part_start));

+  if (num > 0)

+    grub_printf ("+%u", num);

+  if (offset != 0 || length != 0)

+    grub_printf ("[%u-%u]", offset, offset + length);

+}

+

+/* Helper for grub_cmd_blocklist.  */

+static void

+read_blocklist (grub_disk_addr_t sector, unsigned offset, unsigned length,

+		void *data)

+{

+  struct blocklist_ctx *ctx = data;

+

+  if (ctx->num_sectors > 0)

     {

-      if (num_sectors > 0)

+      if (ctx->start_sector + ctx->num_sectors == sector

+	  && offset == 0 && length == GRUB_DISK_SECTOR_SIZE)

 	{

-	  if (start_sector + num_sectors == sector

-	      && offset == 0 && length == GRUB_DISK_SECTOR_SIZE)

-	    {

-	      num_sectors++;

-	      return;

-	    }

-

-	  print_blocklist (start_sector, num_sectors, 0, 0);

-	  num_sectors = 0;

+	  ctx->num_sectors++;

+	  return;

 	}

-      if (offset == 0 && length == GRUB_DISK_SECTOR_SIZE)

-	{

-	  start_sector = sector;

-	  num_sectors++;

-	}

-      else

-	print_blocklist (sector, 0, offset, length);

+      print_blocklist (ctx->start_sector, ctx->num_sectors, 0, 0, ctx);

+      ctx->num_sectors = 0;

     }

-  void NESTED_FUNC_ATTR print_blocklist (grub_disk_addr_t sector, unsigned num,

-			unsigned offset, unsigned length)

+  if (offset == 0 && length == GRUB_DISK_SECTOR_SIZE)

     {

-      if (num_entries++)

-	grub_printf (",");

-

-      grub_printf ("%llu", (unsigned long long) (sector - part_start));

-      if (num > 0)

-	grub_printf ("+%u", num);

-      if (offset != 0 || length != 0)

-	grub_printf ("[%u-%u]", offset, offset + length);

+      ctx->start_sector = sector;

+      ctx->num_sectors++;

     }

+  else

+    print_blocklist (sector, 0, offset, length, ctx);

+}

+

+static grub_err_t

+grub_cmd_blocklist (grub_command_t cmd __attribute__ ((unused)),

+		    int argc, char **args)

+{

+  grub_file_t file;

+  char buf[GRUB_DISK_SECTOR_SIZE];

+  struct blocklist_ctx ctx = {

+    .start_sector = 0,

+    .num_sectors = 0,

+    .num_entries = 0,

+    .part_start = 0

+  };

   if (argc < 1)

     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));

@@ -93,15 +106,16 @@ grub_cmd_blocklist (grub_command_t cmd __attribute__ ((unused)),

     return grub_error (GRUB_ERR_BAD_DEVICE,

 		       "this command is available only for disk devices");

-  part_start = grub_partition_get_start (file->device->disk->partition);

+  ctx.part_start = grub_partition_get_start (file->device->disk->partition);

   file->read_hook = read_blocklist;

+  file->read_hook_data = &ctx;

   while (grub_file_read (file, buf, sizeof (buf)) > 0)

     ;

-  if (num_sectors > 0)

-    print_blocklist (start_sector, num_sectors, 0, 0);

+  if (ctx.num_sectors > 0)

+    print_blocklist (ctx.start_sector, ctx.num_sectors, 0, 0, &ctx;;

   grub_file_close (file);

diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c

index 9a35550..4b94173 100644

--- a/grub-core/commands/loadenv.c

+++ b/grub-core/commands/loadenv.c

@@ -284,44 +284,51 @@ write_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,

   return 1;

 }

+/* Context for grub_cmd_save_env.  */

+struct grub_cmd_save_env_ctx

+{

+  struct blocklist *head, *tail;

+};

+

+/* Store blocklists in a linked list.  */

+static void

+save_env_read_hook (grub_disk_addr_t sector, unsigned offset, unsigned length,

+		    void *data)

+{

+  struct grub_cmd_save_env_ctx *ctx = data;

+  struct blocklist *block;

+

+  if (offset + length > GRUB_DISK_SECTOR_SIZE)

+    /* Seemingly a bug.  */

+    return;

+

+  block = grub_malloc (sizeof (*block));

+  if (! block)

+    return;

+

+  block->sector = sector;

+  block->offset = offset;

+  block->length = length;

+

+  /* Slightly complicated, because the list should be FIFO.  */

+  block->next = 0;

+  if (ctx->tail)

+    ctx->tail->next = block;

+  ctx->tail = block;

+  if (! ctx->head)

+    ctx->head = block;

+}

+

 static grub_err_t

 grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args)

 {

   struct grub_arg_list *state = ctxt->state;

   grub_file_t file;

   grub_envblk_t envblk;

-  struct blocklist *head = 0;

-  struct blocklist *tail = 0;

-

-  /* Store blocklists in a linked list.  */

-  auto void NESTED_FUNC_ATTR read_hook (grub_disk_addr_t sector,

-                                        unsigned offset,

-                                        unsigned length);

-  void NESTED_FUNC_ATTR read_hook (grub_disk_addr_t sector,

-                                   unsigned offset, unsigned length)

-    {

-      struct blocklist *block;

-

-      if (offset + length > GRUB_DISK_SECTOR_SIZE)

-        /* Seemingly a bug.  */

-        return;

-

-      block = grub_malloc (sizeof (*block));

-      if (! block)

-        return;

-

-      block->sector = sector;

-      block->offset = offset;

-      block->length = length;

-

-      /* Slightly complicated, because the list should be FIFO.  */

-      block->next = 0;

-      if (tail)

-        tail->next = block;

-      tail = block;

-      if (! head)

-        head = block;

-    }

+  struct grub_cmd_save_env_ctx ctx = {

+    .head = 0,

+    .tail = 0

+  };

   if (! argc)

     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no variable is specified");

@@ -336,13 +343,14 @@ grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args)

       return grub_error (GRUB_ERR_BAD_DEVICE, "disk device required");

     }

-  file->read_hook = read_hook;

+  file->read_hook = save_env_read_hook;

+  file->read_hook_data = &ctx;

   envblk = read_envblk_file (file);

   file->read_hook = 0;

   if (! envblk)

     goto fail;

-  if (check_blocklists (envblk, head, file))

+  if (check_blocklists (envblk, ctx.head, file))

     goto fail;

   while (argc)

@@ -363,12 +371,12 @@ grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args)

       args++;

     }

-  write_blocklists (envblk, head, file);

+  write_blocklists (envblk, ctx.head, file);

  fail:

   if (envblk)

     grub_envblk_close (envblk);

-  free_blocklists (head);

+  free_blocklists (ctx.head);

   grub_file_close (file);

   return grub_errno;

 }

diff --git a/grub-core/commands/testload.c b/grub-core/commands/testload.c

index a1bf775..4d0280a 100644

--- a/grub-core/commands/testload.c

+++ b/grub-core/commands/testload.c

@@ -31,6 +31,17 @@

 GRUB_MOD_LICENSE ("GPLv3+");

+/* Helper for grub_cmd_testload.  */

+static void

+read_progress (grub_disk_addr_t sector __attribute__ ((unused)),

+	       unsigned offset __attribute__ ((unused)),

+	       unsigned len __attribute__ ((unused)),

+	       void *data __attribute__ ((unused)))

+{

+  grub_xputs (".");

+  grub_refresh ();

+}

+

 static grub_err_t

 grub_cmd_testload (struct grub_command *cmd __attribute__ ((unused)),

 		   int argc, char *argv[])

@@ -39,15 +50,6 @@ grub_cmd_testload (struct grub_command *cmd __attribute__ ((unused)),

   char *buf;

   grub_size_t size;

   grub_off_t pos;

-  auto void NESTED_FUNC_ATTR read_func (grub_disk_addr_t sector, unsigned offset, unsigned len);

-

-  void NESTED_FUNC_ATTR read_func (grub_disk_addr_t sector __attribute__ ((unused)),

-		  unsigned offset __attribute__ ((unused)),

-		  unsigned len __attribute__ ((unused)))

-    {

-      grub_xputs (".");

-      grub_refresh ();

-    }

   if (argc < 1)

     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));

@@ -68,7 +70,7 @@ grub_cmd_testload (struct grub_command *cmd __attribute__ ((unused)),

     goto fail;

   grub_printf ("Reading %s sequentially", argv[0]);

-  file->read_hook = read_func;

+  file->read_hook = read_progress;

   if (grub_file_read (file, buf, size) != (grub_ssize_t) size)

     goto fail;

   grub_printf (" Done.\n");

diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c

index 6c49e5d..726704e 100644

--- a/grub-core/fs/affs.c

+++ b/grub-core/fs/affs.c

@@ -531,7 +531,7 @@ grub_affs_read (grub_file_t file, char *buf, grub_size_t len)

     (struct grub_affs_data *) file->data;

   return grub_fshelp_read_file (data->diropen.data->disk, &data->diropen,

-				file->read_hook,

+				file->read_hook, file->read_hook_data,

 				file->offset, len, buf, grub_affs_read_block,

 				grub_be_to_cpu32 (data->diropen.di.size),

 				data->log_blocksize, 0);

diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c

index fa2fc3f..f2e39d3 100644

--- a/grub-core/fs/bfs.c

+++ b/grub-core/fs/bfs.c

@@ -217,9 +217,7 @@ read_bfs_file (grub_disk_t disk,

 	       const struct grub_bfs_superblock *sb,

 	       const struct grub_bfs_inode *ino,

 	       grub_off_t off, void *buf, grub_size_t len,

-	       void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,

-						   unsigned offset,

-						   unsigned length))

+	       grub_disk_read_hook_t read_hook, void *read_hook_data)

 {

   if (len == 0)

     return GRUB_ERR_NONE;

@@ -245,6 +243,7 @@ read_bfs_file (grub_disk_t disk,

 	      if (read_size > len)

 		read_size = len;

 	      disk->read_hook = read_hook;

+	      disk->read_hook_data = read_hook_data;

 	      err = read_extent (disk, sb, &ino->direct[i], 0, off - pos,

 				 buf, read_size);

 	      disk->read_hook = 0;

@@ -290,6 +289,7 @@ read_bfs_file (grub_disk_t disk,

 	      if (read_size > len)

 		read_size = len;

 	      disk->read_hook = read_hook;

+	      disk->read_hook_data = read_hook_data;

 	      err = read_extent (disk, sb, &entries[i], 0, off - pos,

 				 buf, read_size);

 	      disk->read_hook = 0;

@@ -401,6 +401,7 @@ read_bfs_file (grub_disk_t disk,

 	if (read_size > len)

 	  read_size = len;

 	disk->read_hook = read_hook;

+	disk->read_hook_data = read_hook_data;

 	err = read_extent (disk, sb, &l2_entries[l2n], 0, boff,

 			   buf, read_size);

 	disk->read_hook = 0;

@@ -431,7 +432,7 @@ iterate_in_b_tree (grub_disk_t disk,

   int level;

   grub_uint64_t node_off;

-  err = read_bfs_file (disk, sb, ino, 0, &head, sizeof (head), 0);

+  err = read_bfs_file (disk, sb, ino, 0, &head, sizeof (head), 0, 0);

   if (err)

     return 0;

   node_off = grub_bfs_to_cpu64 (head.root);

@@ -441,7 +442,8 @@ iterate_in_b_tree (grub_disk_t disk,

     {

       struct grub_bfs_btree_node node;

       grub_uint64_t key_value;

-      err = read_bfs_file (disk, sb, ino, node_off, &node, sizeof (node), 0);

+      err = read_bfs_file (disk, sb, ino, node_off, &node, sizeof (node),

+			   0, 0);

       if (err)

 	return 0;

       err = read_bfs_file (disk, sb, ino, node_off

@@ -451,7 +453,7 @@ iterate_in_b_tree (grub_disk_t disk,

 				       BTREE_ALIGN) +

 			   grub_bfs_to_cpu_treehead (node.count_keys) *

 			   sizeof (grub_uint16_t), &key_value,

-			   sizeof (grub_uint64_t), 0);

+			   sizeof (grub_uint64_t), 0, 0);

       if (err)

 	return 0;

@@ -461,7 +463,8 @@ iterate_in_b_tree (grub_disk_t disk,

   while (1)

     {

       struct grub_bfs_btree_node node;

-      err = read_bfs_file (disk, sb, ino, node_off, &node, sizeof (node), 0);

+      err = read_bfs_file (disk, sb, ino, node_off, &node, sizeof (node),

+			   0, 0);

       if (err)

 	return 0;

       {

@@ -473,7 +476,7 @@ iterate_in_b_tree (grub_disk_t disk,

 	err =

 	  read_bfs_file (disk, sb, ino, node_off + sizeof (node), key_data,

-			 grub_bfs_to_cpu_treehead (node.total_key_len), 0);

+			 grub_bfs_to_cpu_treehead (node.total_key_len), 0, 0);

 	if (err)

 	  return 0;

 	key_data[grub_bfs_to_cpu_treehead (node.total_key_len)] = 0;

@@ -483,7 +486,7 @@ iterate_in_b_tree (grub_disk_t disk,

 					 (node.total_key_len), BTREE_ALIGN),

 			     keylen_idx,

 			     grub_bfs_to_cpu_treehead (node.count_keys) *

-			     sizeof (grub_uint16_t), 0);

+			     sizeof (grub_uint16_t), 0, 0);

 	if (err)

 	  return 0;

 	err = read_bfs_file (disk, sb, ino, node_off

@@ -494,7 +497,7 @@ iterate_in_b_tree (grub_disk_t disk,

 			     grub_bfs_to_cpu_treehead (node.count_keys) *

 			     sizeof (grub_uint16_t), key_values,

 			     grub_bfs_to_cpu_treehead (node.count_keys) *

-			     sizeof (grub_uint64_t), 0);

+			     sizeof (grub_uint64_t), 0, 0);

 	if (err)

 	  return 0;

@@ -556,7 +559,7 @@ find_in_b_tree (grub_disk_t disk,

   int level;

   grub_uint64_t node_off;

-  err = read_bfs_file (disk, sb, ino, 0, &head, sizeof (head), 0);

+  err = read_bfs_file (disk, sb, ino, 0, &head, sizeof (head), 0, 0);

   if (err)

     return err;

   node_off = grub_bfs_to_cpu64 (head.root);

@@ -565,7 +568,8 @@ find_in_b_tree (grub_disk_t disk,

   while (1)

     {

       struct grub_bfs_btree_node node;

-      err = read_bfs_file (disk, sb, ino, node_off, &node, sizeof (node), 0);

+      err = read_bfs_file (disk, sb, ino, node_off, &node, sizeof (node),

+			   0, 0);

       if (err)

 	return err;

       if (node.count_keys == 0)

@@ -578,7 +582,7 @@ find_in_b_tree (grub_disk_t disk,

 	unsigned i;

 	err =

 	  read_bfs_file (disk, sb, ino, node_off + sizeof (node), key_data,

-			 grub_bfs_to_cpu_treehead (node.total_key_len), 0);

+			 grub_bfs_to_cpu_treehead (node.total_key_len), 0, 0);

 	if (err)

 	  return err;

 	key_data[grub_bfs_to_cpu_treehead (node.total_key_len)] = 0;

@@ -589,7 +593,7 @@ find_in_b_tree (grub_disk_t disk,

 								 total_key_len),

 				       BTREE_ALIGN), keylen_idx,

 			     grub_bfs_to_cpu_treehead (node.count_keys) *

-			     sizeof (grub_uint16_t), 0);

+			     sizeof (grub_uint16_t), 0, 0);

 	if (err)

 	  return err;

 	err = read_bfs_file (disk, sb, ino, node_off

@@ -600,7 +604,7 @@ find_in_b_tree (grub_disk_t disk,

 			     grub_bfs_to_cpu_treehead (node.count_keys) *

 			     sizeof (grub_uint16_t), key_values,

 			     grub_bfs_to_cpu_treehead (node.count_keys) *

-			     sizeof (grub_uint64_t), 0);

+			     sizeof (grub_uint64_t), 0, 0);

 	if (err)

 	  return err;

@@ -771,7 +775,7 @@ find_file (const char *path, grub_disk_t disk,

 		  return grub_errno;

 		}

 	      grub_free (old_alloc);

-	      err = read_bfs_file (disk, sb, ino, 0, alloc, symsize, 0);

+	      err = read_bfs_file (disk, sb, ino, 0, alloc, symsize, 0, 0);

 	      if (err)

 		{

 		  grub_free (alloc);

@@ -974,7 +978,8 @@ grub_bfs_read (grub_file_t file, char *buf, grub_size_t len)

   struct grub_bfs_data *data = file->data;

   err = read_bfs_file (file->device->disk, &data->sb,

-		       data->ino, file->offset, buf, len, file->read_hook);

+		       data->ino, file->offset, buf, len,

+		       file->read_hook, file->read_hook_data);

   if (err)

     return -1;

   return len;

@@ -1056,7 +1061,7 @@ read_bfs_attr (grub_disk_t disk,

       if (read > len)

 	read = len;

-      err = read_bfs_file (disk, sb, &ino2.ino, 0, buf, read, 0);

+      err = read_bfs_file (disk, sb, &ino2.ino, 0, buf, read, 0, 0);

       if (err)

 	return -1;

       return read;

diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c

index 0ebde35..18429ac 100644

--- a/grub-core/fs/ext2.c

+++ b/grub-core/fs/ext2.c

@@ -525,11 +525,11 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)

    POS.  Return the amount of read bytes in READ.  */

 static grub_ssize_t

 grub_ext2_read_file (grub_fshelp_node_t node,

-		     void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,

-					unsigned offset, unsigned length),

+		     grub_disk_read_hook_t read_hook, void *read_hook_data,

 		     grub_off_t pos, grub_size_t len, char *buf)

 {

-  return grub_fshelp_read_file (node->data->disk, node, read_hook,

+  return grub_fshelp_read_file (node->data->disk, node,

+				read_hook, read_hook_data,

 				pos, len, buf, grub_ext2_read_block,

 				grub_cpu_to_le32 (node->inode.size)

 				| (((grub_off_t) grub_cpu_to_le32 (node->inode.size_high)) << 32),

@@ -676,7 +676,7 @@ grub_ext2_read_symlink (grub_fshelp_node_t node)

 		  grub_le_to_cpu32 (diro->inode.size));

   else

     {

-      grub_ext2_read_file (diro, 0, 0,

+      grub_ext2_read_file (diro, 0, 0, 0,

 			   grub_le_to_cpu32 (diro->inode.size),

 			   symlink);

       if (grub_errno)

@@ -709,7 +709,7 @@ grub_ext2_iterate_dir (grub_fshelp_node_t dir,

     {

       struct ext2_dirent dirent;

-      grub_ext2_read_file (diro, 0, fpos, sizeof (struct ext2_dirent),

+      grub_ext2_read_file (diro, 0, 0, fpos, sizeof (struct ext2_dirent),

 			   (char *) &dirent);

       if (grub_errno)

 	return 0;

@@ -723,7 +723,7 @@ grub_ext2_iterate_dir (grub_fshelp_node_t dir,

 	  struct grub_fshelp_node *fdiro;

 	  enum grub_fshelp_filetype type = GRUB_FSHELP_UNKNOWN;

-	  grub_ext2_read_file (diro, 0, fpos + sizeof (struct ext2_dirent),

+	  grub_ext2_read_file (diro, 0, 0, fpos + sizeof (struct ext2_dirent),

 			       dirent.namelen, filename);

 	  if (grub_errno)

 	    return 0;

@@ -850,7 +850,8 @@ grub_ext2_read (grub_file_t file, char *buf, grub_size_t len)

 {

   struct grub_ext2_data *data = (struct grub_ext2_data *) file->data;

-  return grub_ext2_read_file (&data->diropen, file->read_hook,

+  return grub_ext2_read_file (&data->diropen,

+			      file->read_hook, file->read_hook_data,

 			      file->offset, len, buf);

 }

diff --git a/grub-core/fs/fat.c b/grub-core/fs/fat.c

index 7664153..db28158 100644

--- a/grub-core/fs/fat.c

+++ b/grub-core/fs/fat.c

@@ -454,8 +454,7 @@ grub_fat_mount (grub_disk_t disk)

 static grub_ssize_t

 grub_fat_read_data (grub_disk_t disk, struct grub_fat_data *data,

-		    void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,

-				       unsigned offset, unsigned length),

+		    grub_disk_read_hook_t read_hook, void *read_hook_data,

 		    grub_off_t offset, grub_size_t len, char *buf)

 {

   grub_size_t size;

@@ -561,6 +560,7 @@ grub_fat_read_data (grub_disk_t disk, struct grub_fat_data *data,

 	size = len;

       disk->read_hook = read_hook;

+      disk->read_hook_data = read_hook_data;

       grub_disk_read (disk, sector, offset, size, buf);

       disk->read_hook = 0;

       if (grub_errno)

@@ -630,7 +630,7 @@ grub_fat_iterate_dir_next (grub_disk_t disk, struct grub_fat_data *data,

       ctxt->offset += sizeof (dir);

-      if (grub_fat_read_data (disk, data, 0, ctxt->offset, sizeof (dir),

+      if (grub_fat_read_data (disk, data, 0, 0, ctxt->offset, sizeof (dir),

 			      (char *) &dir)

 	   != sizeof (dir))

 	break;

@@ -652,7 +652,7 @@ grub_fat_iterate_dir_next (grub_disk_t disk, struct grub_fat_data *data,

 	    {

 	      struct grub_fat_dir_entry sec;

 	      ctxt->offset += sizeof (sec);

-	      if (grub_fat_read_data (disk, data, 0,

+	      if (grub_fat_read_data (disk, data, 0, 0,

 				      ctxt->offset, sizeof (sec), (char *) &sec)

 		  != sizeof (sec))

 		break;

@@ -729,7 +729,7 @@ grub_fat_iterate_dir_next (grub_disk_t disk, struct grub_fat_data *data,

       ctxt->offset += sizeof (ctxt->dir);

       /* Read a directory entry.  */

-      if (grub_fat_read_data (disk, data, 0,

+      if (grub_fat_read_data (disk, data, 0, 0,

 			      ctxt->offset, sizeof (ctxt->dir),

 			      (char *) &ctxt->dir)

 	   != sizeof (ctxt->dir) || ctxt->dir.name[0] == 0)

@@ -1031,7 +1031,8 @@ grub_fat_open (grub_file_t file, const char *name)

 static grub_ssize_t

 grub_fat_read (grub_file_t file, char *buf, grub_size_t len)

 {

-  return grub_fat_read_data (file->device->disk, file->data, file->read_hook,

+  return grub_fat_read_data (file->device->disk, file->data,

+			     file->read_hook, file->read_hook_data,

 			     file->offset, len, buf);

 }

@@ -1064,7 +1065,7 @@ grub_fat_label (grub_device_t device, char **label)

     {

       offset += sizeof (dir);

-      if (grub_fat_read_data (disk, data, 0,

+      if (grub_fat_read_data (disk, data, 0, 0,

 			       offset, sizeof (dir), (char *) &dir)

 	   != sizeof (dir))

 	break;

diff --git a/grub-core/fs/fshelp.c b/grub-core/fs/fshelp.c

index 11a1259..d56e63f 100644

--- a/grub-core/fs/fshelp.c

+++ b/grub-core/fs/fshelp.c

@@ -248,14 +248,13 @@ grub_fshelp_find_file (const char *path, grub_fshelp_node_t rootnode,

 /* Read LEN bytes from the file NODE on disk DISK into the buffer BUF,

    beginning with the block POS.  READ_HOOK should be set before

-   reading a block from the file.  GET_BLOCK is used to translate file