dm verity fec: remove redundant unlikely annotation
authorChengguang Xu <cgxu519@gmx.com>
Wed, 13 Feb 2019 05:46:57 +0000 (13:46 +0800)
committerMike Snitzer <snitzer@redhat.com>
Tue, 5 Mar 2019 19:53:48 +0000 (14:53 -0500)
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>
drivers/md/dm-verity-fec.c

index 0ce04e5b4afbaba8b53a145ae20d1652f1c75de7..b634fa23f4c46374afb8a05636b90492d4ad2101 100644 (file)
@@ -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,