Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pjH9R-0005O5-Ns for mharc-grub-devel@gnu.org; Mon, 03 Apr 2023 06:11:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjH9P-0005Mg-1r for grub-devel@gnu.org; Mon, 03 Apr 2023 06:10:59 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjH9M-00015O-Rb for grub-devel@gnu.org; Mon, 03 Apr 2023 06:10:58 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3339Isj3019973 for ; Mon, 3 Apr 2023 10:10:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=hG6Zi4qh7XBtMyFtI5XZEUBA8QkdHd/cMaviztVrHCE=; b=fF4EtdqogyqD6G/1TwhrLCm26duCyW39muOpPXXHImS493n98GJmoaoUjJ5b9pYA3ACt CMJx9wq/SJRI+5fpnwaovvFDtc+XH3GHid684P0PjR0AKy5sAQI/lN/K0X9U6O1IavqU gqs/5sfyjZrLkWSspP1rhDkKetllyigul3lLRzPpTqqNDa0Y67w8Rv41uYgDYGnHGZCQ QflC1xh5pRuPjfXtJoOuxQKIgA4WHI73Jy5ojLhlbpgOsJ6gaxrk0iV7e4187qXJTmXo aTQIxPjrgBbDQidOkPpdd8+v5VWQqZZCtX9FjeK57VYuC4lqR05apmEoyyVJ4ivEhlg6 6g== Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ppxdu453g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 03 Apr 2023 10:10:52 +0000 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3334xIar026257 for ; Mon, 3 Apr 2023 10:10:50 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma06fra.de.ibm.com (PPS) with ESMTPS id 3ppbvfs5mj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 03 Apr 2023 10:10:50 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 333AAlYh12845688 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 Apr 2023 10:10:47 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 933382006E; Mon, 3 Apr 2023 10:10:47 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D752520067; Mon, 3 Apr 2023 10:10:45 +0000 (GMT) Received: from li-e1dea04c-3555-11b2-a85c-f57333552245.ibm.com.ibmuc.com (unknown [9.43.18.215]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 3 Apr 2023 10:10:45 +0000 (GMT) From: Mukesh Kumar Chaurasiya To: grub-devel@gnu.org Cc: meghanaprakash@in.ibm.com, avnish@linux.vnet.ibm.com, brking@linux.vnet.ibm.com, mamatha4@linux.vnet.ibm.com, mchauras@linux.vnet.ibm.com Subject: [PATCH] grub-core/disk: Replace transform_sector function Date: Mon, 3 Apr 2023 15:39:18 +0530 Message-Id: <20230403100917.11775-1-mchauras@linux.vnet.ibm.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: MJuoga0xmOSMrYrVUtOnNM23YSnjzg7D X-Proofpoint-GUID: MJuoga0xmOSMrYrVUtOnNM23YSnjzg7D X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-03_06,2023-04-03_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 spamscore=0 suspectscore=0 adultscore=0 mlxlogscore=481 impostorscore=0 malwarescore=0 mlxscore=0 phishscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304030077 Received-SPF: none client-ip=148.163.156.1; envelope-from=mchauras@linux.vnet.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Apr 2023 10:10:59 -0000 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 --- 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(-) diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c index 01190085e..e20117d5f 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,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), 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..a3321d5f2 100644 --- a/grub-core/lib/disk.c +++ b/grub-core/lib/disk.c @@ -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; -- 2.31.1