1 files changed, 2 insertions, 5 deletions

diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index b252da0e4c11..ae8de9780085 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);
 }
 
 /*
@@ -482,7 +481,7 @@ static inline unsigned int get_limit(struct rq_wb *rwb, unsigned long rw)
 
         /*
          * At this point we know it's a buffered write. If this is
-         * kswapd trying to free memory, or REQ_SYNC is set, set, then
+         * kswapd trying to free memory, or REQ_SYNC is set, then
          * it's WB_SYNC_ALL writeback, and we'll use the max limit for
          * that. If the write is marked as a background write, then use
          * the idle limit, or go to normal if we haven't had competing
@@ -723,8 +722,6 @@ int wbt_init(struct request_queue *q)
                 init_waitqueue_head(&rwb->rq_wait[i].wait);
         }
 
-        rwb->wc = 1;
-        rwb->queue_depth = RWB_DEF_DEPTH;
         rwb->last_comp = rwb->last_issue = jiffies;
         rwb->queue = q;
         rwb->win_nsec = RWB_WINDOW_NSEC;