tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

dm: remove unlikely() before IS_ERR()

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>

authored by

viresh kumar and committed by
Mike Snitzer fc0a4461 e80d1c80

+6 -6
+1 -1
drivers/md/dm-snap-persistent.c
··· 533 533 chunk = area_location(ps, ps->current_area); 534 534 535 535 area = dm_bufio_read(client, chunk, &bp); 536 - if (unlikely(IS_ERR(area))) { 536 + if (IS_ERR(area)) { 537 537 r = PTR_ERR(area); 538 538 goto ret_destroy_bufio; 539 539 }
+1 -1
drivers/md/dm-verity.c
··· 267 267 verity_hash_at_level(v, block, level, &hash_block, &offset); 268 268 269 269 data = dm_bufio_read(v->bufio, hash_block, &buf); 270 - if (unlikely(IS_ERR(data))) 270 + if (IS_ERR(data)) 271 271 return PTR_ERR(data); 272 272 273 273 aux = dm_bufio_get_aux_data(buf);
+4 -4
drivers/md/persistent-data/dm-block-manager.c
··· 454 454 int r; 455 455 456 456 p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result); 457 - if (unlikely(IS_ERR(p))) 457 + if (IS_ERR(p)) 458 458 return PTR_ERR(p); 459 459 460 460 aux = dm_bufio_get_aux_data(to_buffer(*result)); ··· 490 490 return -EPERM; 491 491 492 492 p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result); 493 - if (unlikely(IS_ERR(p))) 493 + if (IS_ERR(p)) 494 494 return PTR_ERR(p); 495 495 496 496 aux = dm_bufio_get_aux_data(to_buffer(*result)); ··· 523 523 int r; 524 524 525 525 p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result); 526 - if (unlikely(IS_ERR(p))) 526 + if (IS_ERR(p)) 527 527 return PTR_ERR(p); 528 528 if (unlikely(!p)) 529 529 return -EWOULDBLOCK; ··· 559 559 return -EPERM; 560 560 561 561 p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result); 562 - if (unlikely(IS_ERR(p))) 562 + if (IS_ERR(p)) 563 563 return PTR_ERR(p); 564 564 565 565 memset(p, 0, dm_bm_block_size(bm));