diff options
| author | Luka Pivk <luka.pivk@toradex.com> | 2019-01-08 07:02:41 +0100 |
|---|---|---|
| committer | Luka Pivk <luka.pivk@toradex.com> | 2019-01-08 07:02:41 +0100 |
| commit | 43f61e8df71c474cd56b5c971096b9cf8d36cd95 (patch) | |
| tree | 0031be65fcc2fd2fd3eceeee9558b5526a19e431 /include/linux/t10-pi.h | |
| parent | 5656ec50dc9950db865d53306326b1a732e3738e (diff) | |
| parent | c04c050f5bf98845bfe22164b8a1503d696a6e26 (diff) | |
Merge remote-tracking branch 'remotes/origin/linux-4.19.y'toradex_4.19.y
Signed-off-by: Luka Pivk <luka.pivk@toradex.com>
Diffstat (limited to 'include/linux/t10-pi.h')
| -rw-r--r-- | include/linux/t10-pi.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/t10-pi.h b/include/linux/t10-pi.h index b9626aa7e90c..3e2a80cc7b56 100644 --- a/include/linux/t10-pi.h +++ b/include/linux/t10-pi.h @@ -39,12 +39,13 @@ struct t10_pi_tuple { static inline u32 t10_pi_ref_tag(struct request *rq) { + unsigned int shift = ilog2(queue_logical_block_size(rq->q)); + #ifdef CONFIG_BLK_DEV_INTEGRITY - return blk_rq_pos(rq) >> - (rq->q->integrity.interval_exp - 9) & 0xffffffff; -#else - return -1U; + if (rq->q->integrity.interval_exp) + shift = rq->q->integrity.interval_exp; #endif + return blk_rq_pos(rq) >> (shift - SECTOR_SHIFT) & 0xffffffff; } extern const struct blk_integrity_profile t10_pi_type1_crc; |