Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 821b40da authored by Chengguang Xu's avatar Chengguang Xu Committed by Mike Snitzer
Browse files

dm verity fec: remove redundant unlikely annotation 



unlikely has already included in IS_ERR(),
so just remove redundant unlikely annotation.

Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 5e3d0e37

drivers/md/dm-verity-fec.c

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static u8 *fec_read_parity(struct dm_verity *v, u64 rsb, int index, 
	*offset = (unsigned)(position - (block << v->data_dev_block_bits));



	res = dm_bufio_read(v->fec->bufio, v->fec->start + block, buf);

	if (unlikely(IS_ERR(res))) {

	if (IS_ERR(res)) {

		DMERR("%s: FEC %llu: parity read failed (block %llu): %ld",

		      v->data_dev->name, (unsigned long long)rsb,

		      (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, 
			dm_bufio_release(buf);



			par = fec_read_parity(v, rsb, block_offset, &offset, &buf);

			if (unlikely(IS_ERR(par)))

			if (IS_ERR(par))

				return PTR_ERR(par);

		}

	}
@@ -253,7 +253,7 @@ static int fec_read_bufs(struct dm_verity *v, struct dm_verity_io *io, 
		}



		bbuf = dm_bufio_read(bufio, block, &buf);

		if (unlikely(IS_ERR(bbuf))) {

		if (IS_ERR(bbuf)) {

			DMWARN_LIMIT("%s: FEC %llu: read failed (%llu): %ld",

				     v->data_dev->name,

				     (unsigned long long)rsb,