Merge tag 'for-linus-20180906' of git://git.kernel.dk/linux-block

[linux.git] / block / blk-wbt.c

diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index bfb0d21d19ce3799550764b19d68a9f66df7328d..8e20a0677dcf69b6e523b571099fede8c9904d78 100644 (file)
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -636,11 +636,6 @@ static void wbt_wait(struct rq_qos *rqos, struct bio *bio, spinlock_t *lock)
                return;
        }
 
-       if (current_is_kswapd())
-               flags |= WBT_KSWAPD;
-       if (bio_op(bio) == REQ_OP_DISCARD)
-               flags |= WBT_DISCARD;
-
        __wbt_wait(rwb, flags, bio->bi_opf, lock);
 
        if (!blk_stat_is_active(rwb->cb))