dm: remove unlikely() before IS_ERR()

IS_ERR() already contains an 'unlikely' compiler flag so there is no
need to do that again from IS_ERR() callers.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index 808b8419bc48d42423d750eb64d178bfa77509e5..bf71583296f732b6b78c71ae67dee5222824b2f8 100644 (file)
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -533,7 +533,7 @@ static int read_exceptions(struct pstore *ps,
                chunk = area_location(ps, ps->current_area);
 
                area = dm_bufio_read(client, chunk, &bp);
-               if (unlikely(IS_ERR(area))) {
+               if (IS_ERR(area)) {
                        r = PTR_ERR(area);
                        goto ret_destroy_bufio;
                }

diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c
index 3adb3323b8c3cac603abc47dd942335da21eb51a..26eff8d41ed2e0c3d133ad9d3f919de0ae70f75e 100644 (file)
--- a/drivers/md/dm-verity.c
+++ b/drivers/md/dm-verity.c
@@ -267,7 +267,7 @@ static int verity_verify_level(struct dm_verity_io *io, sector_t block,
        verity_hash_at_level(v, block, level, &hash_block, &offset);
 
        data = dm_bufio_read(v->bufio, hash_block, &buf);
-       if (unlikely(IS_ERR(data)))
+       if (IS_ERR(data))
                return PTR_ERR(data);
 
        aux = dm_bufio_get_aux_data(buf);

diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c
index 4d6c9b689eaa73d4fccbe44991fc04913e413a8c..88dbe7b97c2c3ca7ace7cbee4b75f80496a0c62a 100644 (file)
--- a/drivers/md/persistent-data/dm-block-manager.c
+++ b/drivers/md/persistent-data/dm-block-manager.c
@@ -454,7 +454,7 @@ int dm_bm_read_lock(struct dm_block_manager *bm, dm_block_t b,
        int r;
 
        p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
-       if (unlikely(IS_ERR(p)))
+       if (IS_ERR(p))
                return PTR_ERR(p);
 
        aux = dm_bufio_get_aux_data(to_buffer(*result));
@@ -490,7 +490,7 @@ int dm_bm_write_lock(struct dm_block_manager *bm,
                return -EPERM;
 
        p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
-       if (unlikely(IS_ERR(p)))
+       if (IS_ERR(p))
                return PTR_ERR(p);
 
        aux = dm_bufio_get_aux_data(to_buffer(*result));
@@ -523,7 +523,7 @@ int dm_bm_read_try_lock(struct dm_block_manager *bm,
        int r;
 
        p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result);
-       if (unlikely(IS_ERR(p)))
+       if (IS_ERR(p))
                return PTR_ERR(p);
        if (unlikely(!p))
                return -EWOULDBLOCK;
@@ -559,7 +559,7 @@ int dm_bm_write_lock_zero(struct dm_block_manager *bm,
                return -EPERM;
 
        p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result);
-       if (unlikely(IS_ERR(p)))
+       if (IS_ERR(p))
                return PTR_ERR(p);
 
        memset(p, 0, dm_bm_block_size(bm));