mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 08:03:01 +09:00
block: switch bios to blk_status_t
Replace bi_error with a new bi_status to allow for a clear conversion. Note that device mapper overloaded bi_error with a private value, which we'll have to keep arround at least for now and thus propagate to a proper blk_status_t value. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
committed by
Jens Axboe
parent
fc17b6534e
commit
4e4cbee93d
@@ -46,8 +46,8 @@ static __be16 t10_pi_ip_fn(void *data, unsigned int len)
|
||||
* 16 bit app tag, 32 bit reference tag. Type 3 does not define the ref
|
||||
* tag.
|
||||
*/
|
||||
static int t10_pi_generate(struct blk_integrity_iter *iter, csum_fn *fn,
|
||||
unsigned int type)
|
||||
static blk_status_t t10_pi_generate(struct blk_integrity_iter *iter,
|
||||
csum_fn *fn, unsigned int type)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
@@ -67,11 +67,11 @@ static int t10_pi_generate(struct blk_integrity_iter *iter, csum_fn *fn,
|
||||
iter->seed++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return BLK_STS_OK;
|
||||
}
|
||||
|
||||
static int t10_pi_verify(struct blk_integrity_iter *iter, csum_fn *fn,
|
||||
unsigned int type)
|
||||
static blk_status_t t10_pi_verify(struct blk_integrity_iter *iter,
|
||||
csum_fn *fn, unsigned int type)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
@@ -108,7 +108,7 @@ static int t10_pi_verify(struct blk_integrity_iter *iter, csum_fn *fn,
|
||||
"(rcvd %04x, want %04x)\n", iter->disk_name,
|
||||
(unsigned long long)iter->seed,
|
||||
be16_to_cpu(pi->guard_tag), be16_to_cpu(csum));
|
||||
return -EILSEQ;
|
||||
return BLK_STS_PROTECTION;
|
||||
}
|
||||
|
||||
next:
|
||||
@@ -117,45 +117,45 @@ next:
|
||||
iter->seed++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return BLK_STS_OK;
|
||||
}
|
||||
|
||||
static int t10_pi_type1_generate_crc(struct blk_integrity_iter *iter)
|
||||
static blk_status_t t10_pi_type1_generate_crc(struct blk_integrity_iter *iter)
|
||||
{
|
||||
return t10_pi_generate(iter, t10_pi_crc_fn, 1);
|
||||
}
|
||||
|
||||
static int t10_pi_type1_generate_ip(struct blk_integrity_iter *iter)
|
||||
static blk_status_t t10_pi_type1_generate_ip(struct blk_integrity_iter *iter)
|
||||
{
|
||||
return t10_pi_generate(iter, t10_pi_ip_fn, 1);
|
||||
}
|
||||
|
||||
static int t10_pi_type1_verify_crc(struct blk_integrity_iter *iter)
|
||||
static blk_status_t t10_pi_type1_verify_crc(struct blk_integrity_iter *iter)
|
||||
{
|
||||
return t10_pi_verify(iter, t10_pi_crc_fn, 1);
|
||||
}
|
||||
|
||||
static int t10_pi_type1_verify_ip(struct blk_integrity_iter *iter)
|
||||
static blk_status_t t10_pi_type1_verify_ip(struct blk_integrity_iter *iter)
|
||||
{
|
||||
return t10_pi_verify(iter, t10_pi_ip_fn, 1);
|
||||
}
|
||||
|
||||
static int t10_pi_type3_generate_crc(struct blk_integrity_iter *iter)
|
||||
static blk_status_t t10_pi_type3_generate_crc(struct blk_integrity_iter *iter)
|
||||
{
|
||||
return t10_pi_generate(iter, t10_pi_crc_fn, 3);
|
||||
}
|
||||
|
||||
static int t10_pi_type3_generate_ip(struct blk_integrity_iter *iter)
|
||||
static blk_status_t t10_pi_type3_generate_ip(struct blk_integrity_iter *iter)
|
||||
{
|
||||
return t10_pi_generate(iter, t10_pi_ip_fn, 3);
|
||||
}
|
||||
|
||||
static int t10_pi_type3_verify_crc(struct blk_integrity_iter *iter)
|
||||
static blk_status_t t10_pi_type3_verify_crc(struct blk_integrity_iter *iter)
|
||||
{
|
||||
return t10_pi_verify(iter, t10_pi_crc_fn, 3);
|
||||
}
|
||||
|
||||
static int t10_pi_type3_verify_ip(struct blk_integrity_iter *iter)
|
||||
static blk_status_t t10_pi_type3_verify_ip(struct blk_integrity_iter *iter)
|
||||
{
|
||||
return t10_pi_verify(iter, t10_pi_ip_fn, 3);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user