From: Mukesh Kumar Chaurasiya <mchauras@linux.vnet.ibm.com>
Date: Mon, 3 Apr 2023 10:09:18 +0000 (+0530)
Subject: disk: Replace transform_sector() function with grub_disk_to_native_sector()
X-Git-Tag: grub-2.12-rc1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5b7fe64d6ba785f2468795b107130c181e15714;p=thirdparty%2Fgrub.git

disk: Replace transform_sector() function with grub_disk_to_native_sector()

The transform_sector() function is not very clear in what it's doing
and confusing. The 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 transform_sector().

Signed-off-by: Mukesh Kumar Chaurasiya <mchauras@linux.vnet.ibm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c
index 01190085e..eb0c7bb73 100644
--- a/grub-core/kern/disk.c
+++ b/grub-core/kern/disk.c
@@ -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,7 @@ 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 +483,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),
diff --git a/grub-core/kern/disk_common.c b/grub-core/kern/disk_common.c
index e09fba8db..ab6cd0c2b 100644
--- a/grub-core/kern/disk_common.c
+++ b/grub-core/kern/disk_common.c
@@ -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)
diff --git a/grub-core/lib/disk.c b/grub-core/lib/disk.c
index b4eb064a8..123993dd4 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->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 +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->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;