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

Read label on UFS1.

Browse source 
* grub-core/fs/ufs.c (grub_ufs_label): Remove MODE_UFS2 condition.
	(grub_ufs_fs): Always set .label.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-10-31 10:52:39 +01:00
parent 87661123b2
commit ce109e843c
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-10-31 Vladimir Serbinenko <phcoder@gmail.com>
Read label on UFS1.
* grub-core/fs/ufs.c (grub_ufs_label): Remove MODE_UFS2 condition.
(grub_ufs_fs): Always set .label.
2011-10-31 Vladimir Serbinenko <phcoder@gmail.com> 2011-10-31 Vladimir Serbinenko <phcoder@gmail.com>
Use shifts in UFS. Use shifts in UFS.

5
grub-core/fs/ufs.c
View file

@ -705,8 +705,6 @@ grub_ufs_close (grub_file_t file)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
#ifdef MODE_UFS2
static grub_err_t static grub_err_t
grub_ufs_label (grub_device_t device, char **label) grub_ufs_label (grub_device_t device, char **label)
{ {
@ -726,7 +724,6 @@ grub_ufs_label (grub_device_t device, char **label)
return grub_errno; return grub_errno;
} }
#endif
static grub_err_t static grub_err_t
grub_ufs_uuid (grub_device_t device, char **uuid) grub_ufs_uuid (grub_device_t device, char **uuid)
@ -790,9 +787,7 @@ static struct grub_fs grub_ufs_fs =
.open = grub_ufs_open, .open = grub_ufs_open,
.read = grub_ufs_read, .read = grub_ufs_read,
.close = grub_ufs_close, .close = grub_ufs_close,
#ifdef MODE_UFS2
.label = grub_ufs_label, .label = grub_ufs_label,
#endif
.uuid = grub_ufs_uuid, .uuid = grub_ufs_uuid,
.mtime = grub_ufs_mtime, .mtime = grub_ufs_mtime,
.next = 0 .next = 0