On Mon, May 14, 2018 at 08:57:10PM +0200, Daniel Kiper wrote: > On Fri, May 11, 2018 at 09:24:45PM +0200, Goffredo Baroncelli wrote: > > The original grub code which handles the recovery of a raid6 disks array > > assumes that all the read are multiple of 1 << GRUB_DISK_SECTOR_BITS and > > s/the read/reads/ > > > it also assumes that all the I/O is done via the struct > > grub_diskfilter_segment. > > This is not true for the btrfs code. In order to reuse the native > > grub_raid6_recover() code, it is modified to not call > > grub_diskfilter_read_node directly, but to call an handler passed > > as argument. > > Could you fix the formating? Currently it is difficult to read. > > > Signed-off-by: Goffredo Baroncelli <kreij...@inwind.it> > > --- > > grub-core/disk/raid6_recover.c | 52 ++++++++++++++++++++++------------ > > include/grub/diskfilter.h | 9 ++++++ > > 2 files changed, 43 insertions(+), 18 deletions(-) > > > > diff --git a/grub-core/disk/raid6_recover.c b/grub-core/disk/raid6_recover.c > > index aa674f6ca..1b37d0552 100644 > > --- a/grub-core/disk/raid6_recover.c > > +++ b/grub-core/disk/raid6_recover.c > > @@ -74,14 +74,25 @@ mod_255 (unsigned x) > > } > > > > static grub_err_t > > -grub_raid6_recover (struct grub_diskfilter_segment *array, int disknr, int > > p, > > - char *buf, grub_disk_addr_t sector, grub_size_t size) > > +raid_recover_read_diskfilter_array (void *data, int disk_nr, > > s/raid_recover_read_diskfilter_array/raid6_read_node_gen/
s/raid_recover_read_diskfilter_array/raid6_recover_read_node_gen/ Daniel _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
