> @@ -186,7 +186,8 @@ void t10_pi_prepare(struct request *rq) > u32 ref_tag = t10_pi_ref_tag(rq); > struct bio *bio; > > - if (rq->rq_disk->protection_type == T10_PI_TYPE3_PROTECTION) > + if (rq->rq_disk->protection_type == T10_PI_TYPE0_PROTECTION || > + rq->rq_disk->protection_type == T10_PI_TYPE3_PROTECTION) Maybe just check for the ones we want to remap instead. And add a little helper stastic inline bool blk_integrity_need_remap(struct gendisk *disk) { return disk->protection_type == T10_PI_TYPE1_PROTECTION || disk->protection_type == T10_PI_TYPE2_PROTECTION; }