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

* grub-core/fs/jfs.c (grub_jfs_sblock): Make volname a char array.

Browse source 
Add new member volname2.
	(grub_jfs_label): Use volname2 if available.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-31 22:49:11 +01:00
parent d1a46f9abd
commit 6c0920e31b
2 changed files with 16 additions and 2 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/jfs.c (grub_jfs_sblock): Make volname a char array.
Add new member volname2.
(grub_jfs_label): Use volname2 if available.
2012-01-31 Vladimir Serbinenko <phcoder@gmail.com> 2012-01-31 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/nilfs2.c (grub_nilfs2_super_block): Expand volume_name * grub-core/fs/nilfs2.c (grub_nilfs2_super_block): Expand volume_name

12
grub-core/fs/jfs.c
View file

@ -53,9 +53,10 @@ struct grub_jfs_sblock
grub_uint16_t log2_blksz; grub_uint16_t log2_blksz;
grub_uint8_t unused[79]; grub_uint8_t unused[79];
grub_uint8_t volname[11]; char volname[11];
grub_uint8_t unused2[24]; grub_uint8_t unused2[24];
grub_uint8_t uuid[16]; grub_uint8_t uuid[16];
char volname2[16];
}; };
struct grub_jfs_extent struct grub_jfs_extent
@ -887,7 +888,14 @@ grub_jfs_label (grub_device_t device, char **label)
data = grub_jfs_mount (device->disk); data = grub_jfs_mount (device->disk);
if (data) if (data)
*label = grub_strndup ((char *) (data->sblock.volname), 11); {
if (data->sblock.volname2[0])
*label = grub_strndup (data->sblock.volname2,
sizeof (data->sblock.volname2));
else
*label = grub_strndup (data->sblock.volname,
sizeof (data->sblock.volname));
}
else else
*label = 0; *label = 0;