diff --git a/ChangeLog b/ChangeLog
index 15fa1a38d..59d00a865 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/bfs.c (iterate_in_b_tree): Add missing NESTED_FUNC_ATTR.
+	(grub_bfs_dir): Likewise.
+
 2012-05-27  Peter Jones <pjones@redhat.com>
 
 	The old code gives arguments to a printf function which can't work
diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c
index 6136ce3e4..318dc3eec 100644
--- a/grub-core/fs/bfs.c
+++ b/grub-core/fs/bfs.c
@@ -413,7 +413,7 @@ static int
 iterate_in_b_tree (grub_disk_t disk,
 		   const struct grub_bfs_superblock *sb,
 		   const struct grub_bfs_inode *ino,
-		   int (*hook) (const char *name, grub_uint64_t value))
+		   int NESTED_FUNC_ATTR (*hook) (const char *name, grub_uint64_t value))
 {
   struct grub_bfs_btree_header head;
   grub_err_t err;
@@ -851,9 +851,9 @@ grub_bfs_dir (grub_device_t device, const char *path,
 {
   struct grub_bfs_superblock sb;
   grub_err_t err;
-  auto int hook (const char *name, grub_uint64_t value);
+  auto int NESTED_FUNC_ATTR hook (const char *name, grub_uint64_t value);
 
-  int hook (const char *name, grub_uint64_t value)
+  int NESTED_FUNC_ATTR hook (const char *name, grub_uint64_t value)
   {
     grub_err_t err2;
     union