lkml.org 
[lkml]   [2015]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/15] drivers: md: Drop unlikely before IS_ERR(_OR_NULL)
    Date
    IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
    is no need to do that again from its callers. Drop it.

    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    ---
    drivers/md/dm-snap-persistent.c | 2 +-
    drivers/md/dm-verity.c | 2 +-
    drivers/md/persistent-data/dm-block-manager.c | 8 ++++----
    3 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
    index 808b8419bc48..bf71583296f7 100644
    --- 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 bb9c6a00e4b0..1d131519ed21 100644
    --- a/drivers/md/dm-verity.c
    +++ b/drivers/md/dm-verity.c
    @@ -271,7 +271,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 4d6c9b689eaa..88dbe7b97c2c 100644
    --- 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));
    --
    2.4.0


    \
     
     \ /
      Last update: 2015-07-31 10:41    [W:2.238 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site