summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChengguang Xu <cgxu519@gmx.com>2019-02-13 00:46:58 -0500
committerMike Snitzer <snitzer@redhat.com>2019-03-05 14:53:48 -0500
commit5941c621dc9eb61e3b22f934675577d559d1fa27 (patch)
tree3e4664bc3aba10868fa34c6943de03864253b443
parent821b40da4d91839005166b808abdc6ca4f5235aa (diff)
dm block manager: remove redundant unlikely annotation
unlikely has already included in IS_ERR(), so just remove redundant unlikely annotation. Signed-off-by: Chengguang Xu <cgxu519@gmx.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-rw-r--r--drivers/md/persistent-data/dm-block-manager.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c
index 492a3f8ac119..3972232b8037 100644
--- a/drivers/md/persistent-data/dm-block-manager.c
+++ b/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,
462 int r; 462 int r;
463 463
464 p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result); 464 p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
465 if (unlikely(IS_ERR(p))) 465 if (IS_ERR(p))
466 return PTR_ERR(p); 466 return PTR_ERR(p);
467 467
468 aux = dm_bufio_get_aux_data(to_buffer(*result)); 468 aux = dm_bufio_get_aux_data(to_buffer(*result));
@@ -498,7 +498,7 @@ int dm_bm_write_lock(struct dm_block_manager *bm,
498 return -EPERM; 498 return -EPERM;
499 499
500 p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result); 500 p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);
501 if (unlikely(IS_ERR(p))) 501 if (IS_ERR(p))
502 return PTR_ERR(p); 502 return PTR_ERR(p);
503 503
504 aux = dm_bufio_get_aux_data(to_buffer(*result)); 504 aux = dm_bufio_get_aux_data(to_buffer(*result));
@@ -531,7 +531,7 @@ int dm_bm_read_try_lock(struct dm_block_manager *bm,
531 int r; 531 int r;
532 532
533 p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result); 533 p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result);
534 if (unlikely(IS_ERR(p))) 534 if (IS_ERR(p))
535 return PTR_ERR(p); 535 return PTR_ERR(p);
536 if (unlikely(!p)) 536 if (unlikely(!p))
537 return -EWOULDBLOCK; 537 return -EWOULDBLOCK;
@@ -567,7 +567,7 @@ int dm_bm_write_lock_zero(struct dm_block_manager *bm,
567 return -EPERM; 567 return -EPERM;
568 568
569 p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result); 569 p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result);
570 if (unlikely(IS_ERR(p))) 570 if (IS_ERR(p))
571 return PTR_ERR(p); 571 return PTR_ERR(p);
572 572
573 memset(p, 0, dm_bm_block_size(bm)); 573 memset(p, 0, dm_bm_block_size(bm));