1 files changed, 2 insertions, 5 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index f84cce42fc5..3deca77e025 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1149,13 +1149,10 @@ void init_request_from_bio(struct request *req, struct bio *bio)
         else
                 req->cmd_flags |= bio->bi_rw & REQ_FAILFAST_MASK;
 
-        if (unlikely(bio_rw_flagged(bio, BIO_RW_DISCARD))) {
+        if (bio_rw_flagged(bio, BIO_RW_DISCARD))
                 req->cmd_flags |= REQ_DISCARD;
-                if (bio_rw_flagged(bio, BIO_RW_BARRIER))
-                        req->cmd_flags |= REQ_SOFTBARRIER;
-        } else if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER)))
+        if (bio_rw_flagged(bio, BIO_RW_BARRIER))
                 req->cmd_flags |= REQ_HARDBARRIER;
-
         if (bio_rw_flagged(bio, BIO_RW_SYNCIO))
                 req->cmd_flags |= REQ_RW_SYNC;
         if (bio_rw_flagged(bio, BIO_RW_META))