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

* include/grub/diskfilter.h (grub_raid5_recover_func_t): Use proper

Browse source 
type for size.
	(grub_raid6_recover_func_t): Likewise.
	* grub-core/disk/raid5_recover.c (grub_raid5_recover): Likewise.
	* grub-core/disk/raid6_recover.c (grub_raid6_recover): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-25 17:36:50 +02:00
parent 0b5ea6b8c3
commit 36498496a0
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2012-06-25 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/diskfilter.h (grub_raid5_recover_func_t): Use proper
type for size.
(grub_raid6_recover_func_t): Likewise.
* grub-core/disk/raid5_recover.c (grub_raid5_recover): Likewise.
* grub-core/disk/raid6_recover.c (grub_raid6_recover): Likewise.
2012-06-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-25 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimage.c (generate_image): Add Fuloong2F verified hash. * util/grub-mkimage.c (generate_image): Add Fuloong2F verified hash.

2
grub-core/disk/raid5_recover.c
View file

@ -29,7 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
static grub_err_t static grub_err_t
grub_raid5_recover (struct grub_diskfilter_segment *array, int disknr, grub_raid5_recover (struct grub_diskfilter_segment *array, int disknr,
char *buf, grub_disk_addr_t sector, int size) char *buf, grub_disk_addr_t sector, grub_size_t size)
{ {
char *buf2; char *buf2;
int i; int i;

2
grub-core/disk/raid6_recover.c
View file

@ -65,7 +65,7 @@ grub_raid6_init_table (void)
static grub_err_t static grub_err_t
grub_raid6_recover (struct grub_diskfilter_segment *array, int disknr, int p, grub_raid6_recover (struct grub_diskfilter_segment *array, int disknr, int p,
char *buf, grub_disk_addr_t sector, int size) char *buf, grub_disk_addr_t sector, grub_size_t size)
{ {
int i, q, pos; int i, q, pos;
int bad1 = -1, bad2 = -1; int bad1 = -1, bad2 = -1;

4
include/grub/diskfilter.h
View file

@ -178,12 +178,12 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
typedef grub_err_t (*grub_raid5_recover_func_t) (struct grub_diskfilter_segment *array, typedef grub_err_t (*grub_raid5_recover_func_t) (struct grub_diskfilter_segment *array,
int disknr, char *buf, int disknr, char *buf,
grub_disk_addr_t sector, grub_disk_addr_t sector,
int size); grub_size_t size);
typedef grub_err_t (*grub_raid6_recover_func_t) (struct grub_diskfilter_segment *array, typedef grub_err_t (*grub_raid6_recover_func_t) (struct grub_diskfilter_segment *array,
int disknr, int p, char *buf, int disknr, int p, char *buf,
grub_disk_addr_t sector, grub_disk_addr_t sector,
int size); grub_size_t size);
extern grub_raid5_recover_func_t grub_raid5_recover_func; extern grub_raid5_recover_func_t grub_raid5_recover_func;
extern grub_raid6_recover_func_t grub_raid6_recover_func; extern grub_raid6_recover_func_t grub_raid6_recover_func;