Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 602548bd authored by Joe Thornber's avatar Joe Thornber Committed by Mike Snitzer
Browse files

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



Signed-off-by: default avatarJoe Thornber <ejt@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent ca763d0a

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

+4 −4
Original line number Diff line number Diff line
@@ -462,7 +462,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 (IS_ERR(p))

	if (unlikely(IS_ERR(p)))

		return PTR_ERR(p);



	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;



	p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result);

	if (IS_ERR(p))

	if (unlikely(IS_ERR(p)))

		return PTR_ERR(p);



	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;



	p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result);

	if (IS_ERR(p))

	if (unlikely(IS_ERR(p)))

		return PTR_ERR(p);

	if (unlikely(!p))

		return -EWOULDBLOCK;
@@ -567,7 +567,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 (IS_ERR(p))

	if (unlikely(IS_ERR(p)))

		return PTR_ERR(p);



	memset(p, 0, dm_bm_block_size(bm));