Merge tag 'pull-bd_flags-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[thirdparty/kernel/linux.git] / block / blk-mq.c

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 8e01e4b32e100f45a5346d22fc652736a33cd0cd..fc364a226e952f59a946b90c992b86d2031ac488 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -93,7 +93,7 @@ static bool blk_mq_check_inflight(struct request *rq, void *priv)
        struct mq_inflight *mi = priv;
 
        if (rq->part && blk_do_io_stat(rq) &&
-           (!mi->part->bd_partno || rq->part == mi->part) &&
+           (!bdev_is_partition(mi->part) || rq->part == mi->part) &&
            blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)
                mi->inflight[rq_data_dir(rq)]++;