Skip to content

L
linux-davinci
Commit a9c701e5 authored by Jens Axboe's avatar Jens Axboe
Browse files
Options

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

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 7a67f63b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
block/blk-core.c
View file @ a9c701e5
......@@ -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
View file @ a9c701e5
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment