Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

block: use symbolic constants for t10_pi type

Replace all hard-coded values with T10_PI_TYPES to make the code more
readable.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Max Gurtovoy and committed by
Jens Axboe
5eaed68d 7ad67ca5

+14 -14
+14 -14
block/t10-pi.c
··· 27 27 * tag. 28 28 */ 29 29 static blk_status_t t10_pi_generate(struct blk_integrity_iter *iter, 30 - csum_fn *fn, unsigned int type) 30 + csum_fn *fn, enum t10_dif_type type) 31 31 { 32 32 unsigned int i; 33 33 ··· 37 37 pi->guard_tag = fn(iter->data_buf, iter->interval); 38 38 pi->app_tag = 0; 39 39 40 - if (type == 1) 40 + if (type == T10_PI_TYPE1_PROTECTION) 41 41 pi->ref_tag = cpu_to_be32(lower_32_bits(iter->seed)); 42 42 else 43 43 pi->ref_tag = 0; ··· 51 51 } 52 52 53 53 static blk_status_t t10_pi_verify(struct blk_integrity_iter *iter, 54 - csum_fn *fn, unsigned int type) 54 + csum_fn *fn, enum t10_dif_type type) 55 55 { 56 56 unsigned int i; 57 57 ··· 60 60 __be16 csum; 61 61 62 62 switch (type) { 63 - case 1: 64 - case 2: 63 + case T10_PI_TYPE1_PROTECTION: 64 + case T10_PI_TYPE2_PROTECTION: 65 65 if (pi->app_tag == T10_PI_APP_ESCAPE) 66 66 goto next; 67 67 ··· 74 74 return BLK_STS_PROTECTION; 75 75 } 76 76 break; 77 - case 3: 77 + case T10_PI_TYPE3_PROTECTION: 78 78 if (pi->app_tag == T10_PI_APP_ESCAPE && 79 79 pi->ref_tag == T10_PI_REF_ESCAPE) 80 80 goto next; ··· 102 102 103 103 static blk_status_t t10_pi_type1_generate_crc(struct blk_integrity_iter *iter) 104 104 { 105 - return t10_pi_generate(iter, t10_pi_crc_fn, 1); 105 + return t10_pi_generate(iter, t10_pi_crc_fn, T10_PI_TYPE1_PROTECTION); 106 106 } 107 107 108 108 static blk_status_t t10_pi_type1_generate_ip(struct blk_integrity_iter *iter) 109 109 { 110 - return t10_pi_generate(iter, t10_pi_ip_fn, 1); 110 + return t10_pi_generate(iter, t10_pi_ip_fn, T10_PI_TYPE1_PROTECTION); 111 111 } 112 112 113 113 static blk_status_t t10_pi_type1_verify_crc(struct blk_integrity_iter *iter) 114 114 { 115 - return t10_pi_verify(iter, t10_pi_crc_fn, 1); 115 + return t10_pi_verify(iter, t10_pi_crc_fn, T10_PI_TYPE1_PROTECTION); 116 116 } 117 117 118 118 static blk_status_t t10_pi_type1_verify_ip(struct blk_integrity_iter *iter) 119 119 { 120 - return t10_pi_verify(iter, t10_pi_ip_fn, 1); 120 + return t10_pi_verify(iter, t10_pi_ip_fn, T10_PI_TYPE1_PROTECTION); 121 121 } 122 122 123 123 static blk_status_t t10_pi_type3_generate_crc(struct blk_integrity_iter *iter) 124 124 { 125 - return t10_pi_generate(iter, t10_pi_crc_fn, 3); 125 + return t10_pi_generate(iter, t10_pi_crc_fn, T10_PI_TYPE3_PROTECTION); 126 126 } 127 127 128 128 static blk_status_t t10_pi_type3_generate_ip(struct blk_integrity_iter *iter) 129 129 { 130 - return t10_pi_generate(iter, t10_pi_ip_fn, 3); 130 + return t10_pi_generate(iter, t10_pi_ip_fn, T10_PI_TYPE3_PROTECTION); 131 131 } 132 132 133 133 static blk_status_t t10_pi_type3_verify_crc(struct blk_integrity_iter *iter) 134 134 { 135 - return t10_pi_verify(iter, t10_pi_crc_fn, 3); 135 + return t10_pi_verify(iter, t10_pi_crc_fn, T10_PI_TYPE3_PROTECTION); 136 136 } 137 137 138 138 static blk_status_t t10_pi_type3_verify_ip(struct blk_integrity_iter *iter) 139 139 { 140 - return t10_pi_verify(iter, t10_pi_ip_fn, 3); 140 + return t10_pi_verify(iter, t10_pi_ip_fn, T10_PI_TYPE3_PROTECTION); 141 141 } 142 142 143 143 const struct blk_integrity_profile t10_pi_type1_crc = {