Commit 3ffb52e7 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: fixup missing conversion from BIO_RW_DISCARD to REQ_DISCARD 



Didn't cause a merge conflict, so fixed this one up manually
post merge.

Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 511d37af

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1598,7 +1598,7 @@ void submit_bio(int rw, struct bio *bio) 
	 * If it's a regular read/write or a barrier with data attached,

	 * go through the normal accounting stuff before submission.

	 */

	if (bio_has_data(bio) && !(rw & (1 << BIO_RW_DISCARD))) {

	if (bio_has_data(bio) && !(rw & REQ_DISCARD)) {

		if (rw & WRITE) {

			count_vm_events(PGPGOUT, count);

		} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE