grub-core/disk: Replace transform_sector function
PATCH 1/1 grub-core/disk: Replace transform_sector function
transform_sector function is not very clear in what it's doing and confusing, grub already has a function which is doing the same thing in a very self explanatory way. i.e. grub_disk_to_native_sector So it's much better to use self explanatory one than transfor_sector
Signed-off-by Mukesh Kumar Chaurasiya <[email protected]>
--- grub-core/kern/disk.c | 7 ++++--- grub-core/kern/disk_common.c | 6 ------ grub-core/lib/disk.c | 6 ++++-- 3 files changed, 8 insertions(+), 11 deletions(-)
grub-core/kern/disk.c +4 -3
@@ -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->disk_read) (disk,transform_sector (disk, sector), + err = (disk->dev->disk_read) (disk,grub_disk_to_native_sector (disk, sector),1U << (GRUB_DISK_CACHE_BITS +GRUB_DISK_SECTOR_BITS - disk->log_sector_size), tmp_buf);
@@ -377,7 +377,8 @@ grub_disk_read_small_real (grub_disk_t disk, grub_disk_addr_t sector,if (!tmp_buf)return grub_errno; -if ((disk->dev->disk_read) (disk,transform_sector (disk, aligned_sector), +if ((disk->dev->disk_read) (disk, +grub_disk_to_native_sector (disk, aligned_sector), num, tmp_buf)) {grub_error_push ();
@@ -483,7 +484,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector, {grub_disk_addr_t i; - err = (disk->dev->disk_read) (disk, transform_sector (disk, sector), + err = (disk->dev->disk_read) (disk, grub_disk_to_native_sector (disk, sector), agglomerate << (GRUB_DISK_CACHE_BITS + GRUB_DISK_SECTOR_BITS - disk->log_sector_size),
grub-core/kern/disk_common.c +0 -6
@@ -50,12 +50,6 @@ grub_disk_adjust_range (grub_disk_t disk, grub_disk_addr_t *sector,return GRUB_ERR_NONE ; } -static inline grub_disk_addr_t -transform_sector (grub_disk_t disk,grub_disk_addr_t sector) -{ -return sector >> (disk->log_sector_size -GRUB_DISK_SECTOR_BITS ); -} -static unsigned grub_disk_cache_get_index (unsigned long dev_id,unsigned long disk_id,grub_disk_addr_t sector)
grub-core/lib/disk.c +4 -2
@@ -101,7 +101,8 @@ 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->disk_write) (disk,transform_sector (disk, sector), +if ((disk->dev->disk_write) (disk, +grub_disk_to_native_sector (disk, sector),1 , tmp_buf) !=GRUB_ERR_NONE ) {grub_free (tmp_buf);
@@ -130,7 +131,8 @@ 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->disk_write) (disk,transform_sector (disk, sector), +if ((disk->dev->disk_write) (disk, +grub_disk_to_native_sector (disk, sector), n, buf) !=GRUB_ERR_NONE ) goto finish;
Signature · 1 line
2.31.1
Quoted 6 lines · Mukesh Kumar Chaurasiya
transform_sectorfunction is not very clear in what it's doing and confusing, grub already has a function which is doing the same thing in a very self explanatory way. i.e.grub_disk_to_native_sectorSo it's much better to use self explanatory one thantransfor_sectorSigned-off-by Mukesh Kumar Chaurasiya <[email protected]>
Reviewed-by Daniel Kiper <[email protected]>
Daniel