block: refactor to use helper

Message ID 20230719121608.32105-1-nj.shetty@samsung.com
State New
Headers
Series block: refactor to use helper |

Commit Message

Nitesh Shetty July 19, 2023, 12:16 p.m. UTC
  Reduce some code by making use of bio_integrity_bytes().

Signed-off-by: Nitesh Shetty <nj.shetty@samsung.com>
---
 block/bio-integrity.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
  

Comments

Martin K. Petersen July 20, 2023, 2:58 a.m. UTC | #1
Nitesh,

> Reduce some code by making use of bio_integrity_bytes().

Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
  
Jens Axboe July 20, 2023, 10:28 p.m. UTC | #2
On Wed, 19 Jul 2023 17:46:08 +0530, Nitesh Shetty wrote:
> Reduce some code by making use of bio_integrity_bytes().
> 
> 

Applied, thanks!

[1/1] block: refactor to use helper
      commit: 8f63fef5867fb5e8c29d9c14b6d739bfc1869d32

Best regards,
  

Patch

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 4533eb491661..8f0af7ac8573 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -199,7 +199,6 @@  bool bio_integrity_prep(struct bio *bio)
 	unsigned long start, end;
 	unsigned int len, nr_pages;
 	unsigned int bytes, offset, i;
-	unsigned int intervals;
 	blk_status_t status;
 
 	if (!bi)
@@ -224,10 +223,9 @@  bool bio_integrity_prep(struct bio *bio)
 		    !(bi->flags & BLK_INTEGRITY_GENERATE))
 			return true;
 	}
-	intervals = bio_integrity_intervals(bi, bio_sectors(bio));
 
 	/* Allocate kernel buffer for protection data */
-	len = intervals * bi->tuple_size;
+	len = bio_integrity_bytes(bi, bio_sectors(bio));
 	buf = kmalloc(len, GFP_NOIO);
 	status = BLK_STS_RESOURCE;
 	if (unlikely(buf == NULL)) {