From 83e4e7d317cd78e81a1159a6dfe0a2d2bedb1c42 Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Thu, 19 Apr 2012 14:42:37 -0400 Subject: [PATCH 3/3] dm thin: simplify branching in the slow path bite the bullet since non power of 2 was enabled anyway --- drivers/md/dm-thin.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index 2a0958d..8256d0e 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c @@ -694,12 +694,9 @@ static inline sector_t pool_block_non_pow2_do_div(sector_t a, struct pool *pool) static inline sector_t pool_block_do_div(sector_t a, struct pool *pool) { - if (static_key_false(&non_pow2_division_enabled.key)) { - if (pool->block_shift) - return pool_block_pow2_do_div(a, pool); - else - return pool_block_non_pow2_do_div(a, pool); - } else + if (static_key_false(&non_pow2_division_enabled.key)) + return pool_block_non_pow2_do_div(a, pool); + else return pool_block_pow2_do_div(a, pool); } @@ -725,12 +722,9 @@ static inline sector_t pool_block_non_pow2_do_mod(sector_t a, struct pool *pool) static inline sector_t pool_block_do_mod(sector_t a, struct pool *pool) { - if (static_key_false(&non_pow2_division_enabled.key)) { - if (pool->block_shift) - return pool_block_pow2_do_mod(a, pool); - else - return pool_block_non_pow2_do_mod(a, pool); - } else + if (static_key_false(&non_pow2_division_enabled.key)) + return pool_block_non_pow2_do_mod(a, pool); + else return pool_block_pow2_do_mod(a, pool); } -- 1.7.1