diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 12:17:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 12:17:19 -0400 |
| commit | 68e71d1902a820c9bc7a5a6c23260841caafff33 (patch) | |
| tree | a9ba52bdfef99e7bdc5f8623772d76789f7b7c8b /block/blk-core.c | |
| parent | 066455d471e997adbcc98dda62eaf461e8b6556e (diff) | |
| parent | 592b09a42fc3ae6737a0f3ecf4fee42ecd0296f8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
backing-dev: ensure that a removed bdi no longer has super_block referencing it
block: use after free bug in __blkdev_get
block: silently error unsupported empty barriers too
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index ac0fa10f8fa5..71da5111120c 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -1161,7 +1161,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) | |||
| 1161 | const unsigned int ff = bio->bi_rw & REQ_FAILFAST_MASK; | 1161 | const unsigned int ff = bio->bi_rw & REQ_FAILFAST_MASK; |
| 1162 | int rw_flags; | 1162 | int rw_flags; |
| 1163 | 1163 | ||
| 1164 | if (bio_rw_flagged(bio, BIO_RW_BARRIER) && bio_has_data(bio) && | 1164 | if (bio_rw_flagged(bio, BIO_RW_BARRIER) && |
| 1165 | (q->next_ordered == QUEUE_ORDERED_NONE)) { | 1165 | (q->next_ordered == QUEUE_ORDERED_NONE)) { |
| 1166 | bio_endio(bio, -EOPNOTSUPP); | 1166 | bio_endio(bio, -EOPNOTSUPP); |
| 1167 | return 0; | 1167 | return 0; |