Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54d12f2b authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcache: Advertise that flushes are supported 



Whoops - bcache's flush/FUA was mostly correct, but flushes get filtered
out unless we say we support them...

Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
parent d2a65ce2

drivers/md/bcache/request.c

+7 −1
Original line number Diff line number Diff line
@@ -488,6 +488,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;
@@ -710,7 +716,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;

drivers/md/bcache/super.c

+2 −0
Original line number Diff line number Diff line
@@ -806,6 +806,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;

}