Skip to content

Commit

Permalink
dm: remove unlikely() before IS_ERR()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
viresh kumar authored and Mike Snitzer committed Aug 12, 2015
1 parent e80d1c8 commit fc0a446
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/md/dm-snap-persistent.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/dm-verity.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions drivers/md/persistent-data/dm-block-manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down

0 comments on commit fc0a446

Please sign in to comment.