* grub-core/fs/nilfs2.c (grub_nilfs2_palloc_entry_offset_log):

	Fix argument to grub_nilfs2_palloc_bitmap_block_offset.

diff --git a/ChangeLog b/ChangeLog
index 5ae3106a6734bd5572ac5ab6142ace2f7ef718f7..eadfdf375472f258051d8a64cec3cba776308e8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/nilfs2.c (grub_nilfs2_palloc_entry_offset_log):
+       Fix argument to grub_nilfs2_palloc_bitmap_block_offset.
+
 2012-04-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/squash4.c (lzo_decompress): Set grub_errno on error.

diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c
index 89fc28bd373fa55f617da286b8a14afdb465c3a0..d39ea9ed37ada96da3781c39c424c6d882205849 100644 (file)
--- a/grub-core/fs/nilfs2.c
+++ b/grub-core/fs/nilfs2.c
@@ -377,7 +377,7 @@ grub_nilfs2_palloc_entry_offset_log (struct grub_nilfs2_data *data,
   group = grub_nilfs2_palloc_group (data, nr, &group_offset);
 
   return grub_nilfs2_palloc_bitmap_block_offset (data, group,
-                                                1 << log_entry_size) + 1 +
+                                                log_entry_size) + 1 +
     (group_offset >> grub_nilfs2_log_entries_per_block_log (data,
                                                            log_entry_size));