diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-17 10:11:00 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-17 10:11:00 +0200 |
| commit | 05fc5d209cb070c621dbcbc20397eb4346dbaa86 (patch) | |
| tree | 9f70fe5a6dfcb6a83d5bb1438e3b1e6f6fb3b962 /block | |
| parent | 0395d775b4a12009d7231357b04157fae713bfe0 (diff) | |
| parent | fbbf055692aeb25c54c49d9ca84532de836fbba0 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 5cb6ca99fd7f..7239bb77fced 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)) |