From: weiping zhang <zhangweiping@didichuxing.com>
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-Tag: v4.15-rc2~12^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62d772fa9d86856d828cd24dd8fff5c83275c7e1;p=thirdparty%2Fkernel%2Flinux.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 <zhangweiping@didichuxing.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index ec903532a5d1c..19faecc5f8f6f 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);
 }
 
 /*