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

Commit 1e87901e authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

block: filter flush bio's in __generic_make_request() 



There are a number of make_request based drivers which don't support
cache flushes.  Filter out flush bio's in __generic_make_request() so
that they don't have to worry about them.  All FLUSH/FUA requests with
data are converted to regular IO requests and empty ones are completed
immediately.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 4fed947c

block/blk-core.c

+13 −0
Original line number Diff line number Diff line
@@ -1509,6 +1509,19 @@ static inline void __generic_make_request(struct bio *bio) 
		if (bio_check_eod(bio, nr_sectors))

			goto end_io;



		/*

		 * Filter flush bio's early so that make_request based

		 * drivers without flush support don't have to worry

		 * about them.

		 */

		if ((bio->bi_rw & (REQ_FLUSH | REQ_FUA)) && !q->flush_flags) {

			bio->bi_rw &= ~(REQ_FLUSH | REQ_FUA);

			if (!nr_sectors) {

				err = 0;

				goto end_io;

			}

		}



		if ((bio->bi_rw & REQ_DISCARD) &&

		    (!blk_queue_discard(q) ||

		     ((bio->bi_rw & REQ_SECURE) &&