vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
over last_mounted as seen in image generated by mkfs.nilfs2.
	(grub_nilfs2_label): Use sizeof for the size of s_volume_name.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-31 22:43:29 +01:00
parent dec8ed14b9
commit d1a46f9abd
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2012-01-31 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/fat.c (grub_fat_dir_entry) [MODE_EXFAT]: Expand label * grub-core/fs/fat.c (grub_fat_dir_entry) [MODE_EXFAT]: Expand label

6
grub-core/fs/nilfs2.c
View file

@ -126,8 +126,7 @@ struct grub_nilfs2_super_block
grub_uint16_t s_checkpoint_size; grub_uint16_t s_checkpoint_size;
grub_uint16_t s_segment_usage_size; grub_uint16_t s_segment_usage_size;
grub_uint8_t s_uuid[16]; grub_uint8_t s_uuid[16];
char s_volume_name[16]; char s_volume_name[80];
char s_last_mounted[64];
grub_uint32_t s_c_interval; grub_uint32_t s_c_interval;
grub_uint32_t s_c_block_max; grub_uint32_t s_c_block_max;
grub_uint32_t s_reserved[192]; grub_uint32_t s_reserved[192];
@ -1099,7 +1098,8 @@ grub_nilfs2_label (grub_device_t device, char **label)
data = grub_nilfs2_mount (disk); data = grub_nilfs2_mount (disk);
if (data) 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 else
*label = NULL; *label = NULL;