diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2013-07-10 18:44:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-28 16:30:09 -0700 |
| commit | 3fcbc17636c83da9d85e2604de4af56c215e6e3c (patch) | |
| tree | e3c8e7fc4cad85412c2a8326de6d752cacd3fd68 /drivers/md | |
| parent | c0d8f455600820eb05208b57c50d4e90a58c4d96 (diff) | |
| download | linux-3.10-3fcbc17636c83da9d85e2604de4af56c215e6e3c.tar.gz linux-3.10-3fcbc17636c83da9d85e2604de4af56c215e6e3c.tar.bz2 linux-3.10-3fcbc17636c83da9d85e2604de4af56c215e6e3c.zip | |
bcache: Advertise that flushes are supported
commit 54d12f2b4fd0f218590d1490b41a18d0e2328a9a upstream.
Whoops - bcache's flush/FUA was mostly correct, but flushes get filtered
out unless we say we support them...
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/bcache/request.c | 8 | ||||
| -rw-r--r-- | drivers/md/bcache/super.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index e5ff12e52d5..2f36743ce70 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -489,6 +489,12 @@ static void bch_insert_data_loop(struct closure *cl) bch_queue_gc(op->c); } + /* + * Journal writes are marked REQ_FLUSH; if the original write was a + * flush, it'll wait on the journal write. + */ + bio->bi_rw &= ~(REQ_FLUSH|REQ_FUA); + do { unsigned i; struct bkey *k; @@ -716,7 +722,7 @@ static struct search *search_alloc(struct bio *bio, struct bcache_device *d) s->task = current; s->orig_bio = bio; s->write = (bio->bi_rw & REQ_WRITE) != 0; - s->op.flush_journal = (bio->bi_rw & REQ_FLUSH) != 0; + s->op.flush_journal = (bio->bi_rw & (REQ_FLUSH|REQ_FUA)) != 0; s->op.skip = (bio->bi_rw & REQ_DISCARD) != 0; s->recoverable = 1; s->start_time = jiffies; diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index f88e2b653a3..a7d9828b01d 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -781,6 +781,8 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size) set_bit(QUEUE_FLAG_NONROT, &d->disk->queue->queue_flags); set_bit(QUEUE_FLAG_DISCARD, &d->disk->queue->queue_flags); + blk_queue_flush(q, REQ_FLUSH|REQ_FUA); + return 0; } |