summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChengguang Xu <cgxu519@gmx.com>2019-02-13 00:46:57 -0500
committerMike Snitzer <snitzer@redhat.com>2019-03-05 14:53:48 -0500
commit821b40da4d91839005166b808abdc6ca4f5235aa (patch)
treed5b79b3319a23092e3c4100830322e684d3ff1c1
parent5e3d0e37062e2fc28187db403b11ce7764d843a5 (diff)
dm verity fec: remove redundant unlikely annotation
unlikely has already included in IS_ERR(), so just remove redundant unlikely annotation. Signed-off-by: Chengguang Xu <cgxu519@gmx.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-rw-r--r--drivers/md/dm-verity-fec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c
index 0ce04e5b4afb..b634fa23f4c4 100644
--- a/drivers/md/dm-verity-fec.c
+++ b/drivers/md/dm-verity-fec.c
@@ -73,7 +73,7 @@ static u8 *fec_read_parity(struct dm_verity *v, u64 rsb, int index,
73 *offset = (unsigned)(position - (block << v->data_dev_block_bits)); 73 *offset = (unsigned)(position - (block << v->data_dev_block_bits));
74 74
75 res = dm_bufio_read(v->fec->bufio, v->fec->start + block, buf); 75 res = dm_bufio_read(v->fec->bufio, v->fec->start + block, buf);
76 if (unlikely(IS_ERR(res))) { 76 if (IS_ERR(res)) {
77 DMERR("%s: FEC %llu: parity read failed (block %llu): %ld", 77 DMERR("%s: FEC %llu: parity read failed (block %llu): %ld",
78 v->data_dev->name, (unsigned long long)rsb, 78 v->data_dev->name, (unsigned long long)rsb,
79 (unsigned long long)(v->fec->start + block), 79 (unsigned long long)(v->fec->start + block),
@@ -163,7 +163,7 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio,
163 dm_bufio_release(buf); 163 dm_bufio_release(buf);
164 164
165 par = fec_read_parity(v, rsb, block_offset, &offset, &buf); 165 par = fec_read_parity(v, rsb, block_offset, &offset, &buf);
166 if (unlikely(IS_ERR(par))) 166 if (IS_ERR(par))
167 return PTR_ERR(par); 167 return PTR_ERR(par);
168 } 168 }
169 } 169 }
@@ -253,7 +253,7 @@ static int fec_read_bufs(struct dm_verity *v, struct dm_verity_io *io,
253 } 253 }
254 254
255 bbuf = dm_bufio_read(bufio, block, &buf); 255 bbuf = dm_bufio_read(bufio, block, &buf);
256 if (unlikely(IS_ERR(bbuf))) { 256 if (IS_ERR(bbuf)) {
257 DMWARN_LIMIT("%s: FEC %llu: read failed (%llu): %ld", 257 DMWARN_LIMIT("%s: FEC %llu: read failed (%llu): %ld",
258 v->data_dev->name, 258 v->data_dev->name,
259 (unsigned long long)rsb, 259 (unsigned long long)rsb,