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

Commit a9c701e5 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: use bio_has_data() to check for data carrying bio 



Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 7a67f63b

block/blk-core.c

+1 −4
Original line number Diff line number Diff line
@@ -1490,10 +1490,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_empty_barrier(bio)) {



		BIO_BUG_ON(!bio->bi_size);

		BIO_BUG_ON(!bio->bi_io_vec);

	if (bio_has_data(bio)) {



		if (rw & WRITE) {

			count_vm_events(PGPGOUT, count);

include/linux/bio.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ struct bio { 
#define bio_failfast(bio)	((bio)->bi_rw & (1 << BIO_RW_FAILFAST))

#define bio_rw_ahead(bio)	((bio)->bi_rw & (1 << BIO_RW_AHEAD))

#define bio_rw_meta(bio)	((bio)->bi_rw & (1 << BIO_RW_META))

#define bio_empty_barrier(bio)	(bio_barrier(bio) && !(bio)->bi_size)

#define bio_empty_barrier(bio)	(bio_barrier(bio) && !bio_has_data(bio))



static inline unsigned int bio_cur_sectors(struct bio *bio)

{