From: Chengguang Xu <cgxu519@gmx.com>
Date: Wed, 13 Feb 2019 05:46:56 +0000 (+0800)
Subject: dm integrity: remove redundant unlikely annotation
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5e3d0e37062e2fc28187db403b11ce7764d843a5;p=openwrt%2Fstaging%2Fblogic.git

dm integrity: 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>
---

diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 457200ca6287..f1ab81b19de9 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -1122,7 +1122,7 @@ static int dm_integrity_rw_tag(struct dm_integrity_c *ic, unsigned char *tag, se
 			return r;
 
 		data = dm_bufio_read(ic->bufio, *metadata_block, &b);
-		if (unlikely(IS_ERR(data)))
+		if (IS_ERR(data))
 			return PTR_ERR(data);
 
 		to_copy = min((1U << SECTOR_SHIFT << ic->log2_buffer_sectors) - *metadata_offset, total_size);