|
@@ -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));
|