From: weiping zhang Date: Thu, 23 Nov 2017 13:39:55 +0000 (+0800) Subject: blk-wbt: move wbt_clear_stat to common place in wbt_done X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=62d772fa9d86856d828cd24dd8fff5c83275c7e1;p=openwrt%2Fstaging%2Fblogic.git blk-wbt: move wbt_clear_stat to common place in wbt_done wbt_done call wbt_clear_stat no matter current stat was tracked or not, move it to common place. Signed-off-by: weiping zhang Signed-off-by: Jens Axboe --- diff --git a/block/blk-wbt.c b/block/blk-wbt.c index ec903532a5d1..19faecc5f8f6 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -178,12 +178,11 @@ void wbt_done(struct rq_wb *rwb, struct blk_issue_stat *stat) if (wbt_is_read(stat)) wb_timestamp(rwb, &rwb->last_comp); - wbt_clear_state(stat); } else { WARN_ON_ONCE(stat == rwb->sync_cookie); __wbt_done(rwb, wbt_stat_to_mask(stat)); - wbt_clear_state(stat); } + wbt_clear_state(stat); } /*