Browse Source

dm block manager: add unlikely() annotations on dm_bufio error paths

Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Joe Thornber 10 years ago
parent
commit
602548bdd5
1 changed files with 4 additions and 4 deletions
  1. 4 4
      drivers/md/persistent-data/dm-block-manager.c

+ 4 - 4
drivers/md/persistent-data/dm-block-manager.c

@@ -462,7 +462,7 @@ int dm_bm_read_lock(struct dm_block_manager *bm, dm_block_t b,
 	int r;
 	int r;
 
 
 	p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
 	p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
-	if (IS_ERR(p))
+	if (unlikely(IS_ERR(p)))
 		return PTR_ERR(p);
 		return PTR_ERR(p);
 
 
 	aux = dm_bufio_get_aux_data(to_buffer(*result));
 	aux = dm_bufio_get_aux_data(to_buffer(*result));
@@ -498,7 +498,7 @@ int dm_bm_write_lock(struct dm_block_manager *bm,
 		return -EPERM;
 		return -EPERM;
 
 
 	p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
 	p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
-	if (IS_ERR(p))
+	if (unlikely(IS_ERR(p)))
 		return PTR_ERR(p);
 		return PTR_ERR(p);
 
 
 	aux = dm_bufio_get_aux_data(to_buffer(*result));
 	aux = dm_bufio_get_aux_data(to_buffer(*result));
@@ -531,7 +531,7 @@ int dm_bm_read_try_lock(struct dm_block_manager *bm,
 	int r;
 	int r;
 
 
 	p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result);
 	p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result);
-	if (IS_ERR(p))
+	if (unlikely(IS_ERR(p)))
 		return PTR_ERR(p);
 		return PTR_ERR(p);
 	if (unlikely(!p))
 	if (unlikely(!p))
 		return -EWOULDBLOCK;
 		return -EWOULDBLOCK;
@@ -567,7 +567,7 @@ int dm_bm_write_lock_zero(struct dm_block_manager *bm,
 		return -EPERM;
 		return -EPERM;
 
 
 	p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result);
 	p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result);
-	if (IS_ERR(p))
+	if (unlikely(IS_ERR(p)))
 		return PTR_ERR(p);
 		return PTR_ERR(p);
 
 
 	memset(p, 0, dm_bm_block_size(bm));
 	memset(p, 0, dm_bm_block_size(bm));