* grub-core/fs/nilfs2.c (grub_nilfs2_super_block): Expand volume_name

	over last_mounted as seen in image generated by mkfs.nilfs2.
	(grub_nilfs2_label): Use sizeof for the size of s_volume_name.

diff --git a/ChangeLog b/ChangeLog
index becac92b6529d37b6f644044e30a1873106f72fa..eaad8130e3014a3f2b7b078a8e50c349ef6d5ef6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/nilfs2.c (grub_nilfs2_super_block): Expand volume_name
+       over last_mounted as seen in image generated by mkfs.nilfs2.
+       (grub_nilfs2_label): Use sizeof for the size of s_volume_name.
+
 2012-01-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/fat.c (grub_fat_dir_entry) [MODE_EXFAT]: Expand label

diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c
index 62611fedbd4d3473928106e9a2f2e87ef197660b..31d91dbd904372afca5161864ca7abdf2613a0dc 100644 (file)
--- a/grub-core/fs/nilfs2.c
+++ b/grub-core/fs/nilfs2.c
@@ -126,8 +126,7 @@ struct grub_nilfs2_super_block
   grub_uint16_t s_checkpoint_size;
   grub_uint16_t s_segment_usage_size;
   grub_uint8_t s_uuid[16];
-  char s_volume_name[16];
-  char s_last_mounted[64];
+  char s_volume_name[80];
   grub_uint32_t s_c_interval;
   grub_uint32_t s_c_block_max;
   grub_uint32_t s_reserved[192];
@@ -1099,7 +1098,8 @@ grub_nilfs2_label (grub_device_t device, char **label)
 
   data = grub_nilfs2_mount (disk);
   if (data)
-    *label = grub_strndup (data->sblock.s_volume_name, 14);
+    *label = grub_strndup (data->sblock.s_volume_name,
+                          sizeof (data->sblock.s_volume_name));
   else
     *label = NULL;