Re: [PATCH] Rename grub_disk members

[Daniel Kiper]

On Fri, Mar 22, 2019 at 11:52:10PM +0000, Colin Watson wrote:
> On Fri, Mar 22, 2019 at 05:30:56PM +0100, Vladimir 'phcoder' Serbinenko wrote:
> > Otherwise it horribly clashes with gnulib when it's
> > replacing open/write/read/close
>
> Oh, good point, thanks.
>
> > @@ -341,7 +341,7 @@ grub_disk_read_small_real (grub_disk_t disk, 
> > grub_disk_addr_t sector,
> >        < (disk->total_sectors << (disk->log_sector_size - 
> > GRUB_DISK_SECTOR_BITS)))
> >      {
> >        grub_err_t err;
> > -      err = (disk->dev->read) (disk, transform_sector (disk, sector),
> > +      err = (disk->dev->disk_read) (disk, transform_sector (disk, sector),
> >                            1U << (GRUB_DISK_CACHE_BITS
> >                                   + GRUB_DISK_SECTOR_BITS
> >                                   - disk->log_sector_size), tmp_buf);
> > @@ -377,7 +377,7 @@ grub_disk_read_small_real (grub_disk_t disk, 
> > grub_disk_addr_t sector,
> >      if (!tmp_buf)
> >        return grub_errno;
> >
> > -    if ((disk->dev->read) (disk, transform_sector (disk, aligned_sector),
> > +    if ((disk->dev->disk_read) (disk, transform_sector (disk, 
> > aligned_sector),
> >                        num, tmp_buf))
> >        {
> >     grub_error_push ();
> > @@ -483,7 +483,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t 
> > sector,
> >     {
> >       grub_disk_addr_t i;
> >
> > -     err = (disk->dev->read) (disk, transform_sector (disk, sector),
> > +     err = (disk->dev->disk_read) (disk, transform_sector (disk, sector),
> >                                agglomerate << (GRUB_DISK_CACHE_BITS
> >                                                + GRUB_DISK_SECTOR_BITS
> >                                                - disk->log_sector_size),
>
> Could you fix up the indentation of the following lines in these three
> hunks?
>
> > diff --git a/grub-core/lib/disk.c b/grub-core/lib/disk.c
> > index 0f186883a..885d50fa9 100644
> > --- a/grub-core/lib/disk.c
> > +++ b/grub-core/lib/disk.c
> > @@ -101,7 +101,7 @@ grub_disk_write (grub_disk_t disk, grub_disk_addr_t 
> > sector,
> >
> >       grub_disk_cache_invalidate (disk->dev->id, disk->id, sector);
> >
> > -     if ((disk->dev->write) (disk, transform_sector (disk, sector),
> > +     if ((disk->dev->disk_write) (disk, transform_sector (disk, sector),
> >                               1, tmp_buf) != GRUB_ERR_NONE)
> >         {
> >           grub_free (tmp_buf);
> > @@ -130,7 +130,7 @@ grub_disk_write (grub_disk_t disk, grub_disk_addr_t 
> > sector,
> >              << (GRUB_DISK_CACHE_BITS + GRUB_DISK_SECTOR_BITS
> >                  - disk->log_sector_size));
> >
> > -     if ((disk->dev->write) (disk, transform_sector (disk, sector),
> > +     if ((disk->dev->disk_write) (disk, transform_sector (disk, sector),
> >                               n, buf) != GRUB_ERR_NONE)
> >         goto finish;
> >
>
> Likewise here.
>
> > diff --git a/include/grub/disk.h b/include/grub/disk.h
> > index bd58b11d5..316659fee 100644
> > --- a/include/grub/disk.h
> > +++ b/include/grub/disk.h
> > @@ -77,26 +77,26 @@ struct grub_disk_dev
> >    enum grub_disk_dev_id id;
> >
> >    /* Call HOOK with each device name, until HOOK returns non-zero.  */
> > -  int (*iterate) (grub_disk_dev_iterate_hook_t hook, void *hook_data,
> > +  int (*disk_iterate) (grub_disk_dev_iterate_hook_t hook, void *hook_data,
> >               grub_disk_pull_t pull);
> [...]
> > /* Write SIZE sectors from BUF into the sector SECTOR of the disk DISK.  */
> > -  grub_err_t (*write) (struct grub_disk *disk, grub_disk_addr_t sector,
> > +  grub_err_t (*disk_write) (struct grub_disk *disk, grub_disk_addr_t 
> > sector,
> >                    grub_size_t size, const char *buf);
>
> And here.
>
> Otherwise LGTM, so:
>
> Reviewed-by: Colin Watson <address@hidden>

If you take Colin's comments into account then
Reviewed-by: Daniel Kiper <address@hidden>

Daniel