Skip to content

Commit 01f58f2

Browse files
calebsanderkawasaki
authored andcommitted
blk-integrity: take u64 in bio_integrity_intervals()
To allow bio_integrity_intervals() to convert an absolute sector to an absolute integrity interval, use u64 for its argument and return types. Also use SECTOR_SHIFT instead of the magic constant 9. Signed-off-by: Caleb Sander Mateos <[email protected]> Reviewed-by: Anuj Gupta <[email protected]>
1 parent ded4411 commit 01f58f2

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

include/linux/blk-integrity.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,19 @@ queue_max_integrity_segments(const struct request_queue *q)
6666
}
6767

6868
/**
69-
* bio_integrity_intervals - Return number of integrity intervals for a bio
69+
* bio_integrity_intervals - Convert sectors to integrity intervals
7070
* @bi: blk_integrity profile for device
71-
* @sectors: Size of the bio in 512-byte sectors
71+
* @sectors: Number of 512-byte sectors
7272
*
7373
* Description: The block layer calculates everything in 512 byte
7474
* sectors but integrity metadata is done in terms of the data integrity
7575
* interval size of the storage device. Convert the block layer sectors
7676
* to the appropriate number of integrity intervals.
7777
*/
78-
static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,
79-
unsigned int sectors)
78+
static inline u64 bio_integrity_intervals(const struct blk_integrity *bi,
79+
u64 sectors)
8080
{
81-
return sectors >> (bi->interval_exp - 9);
81+
return sectors >> (bi->interval_exp - SECTOR_SHIFT);
8282
}
8383

8484
static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi,
@@ -153,8 +153,8 @@ queue_max_integrity_segments(const struct request_queue *q)
153153
return 0;
154154
}
155155

156-
static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,
157-
unsigned int sectors)
156+
static inline u64 bio_integrity_intervals(const struct blk_integrity *bi,
157+
u64 sectors)
158158
{
159159
return 0;
160160
}

0 commit comments

Comments
 (0)