From c12ea778654778f2039369323e8875e71d3a5609 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 29 Apr 2019 18:20:21 -0700 Subject: [PATCH] Linux 5.0 compat: Remove incorrect ASSERT Not all block devices, notably scsi_debug, set a root_blkg on the request queue. Remove this assertion and allow the the existing call to blkg_tryget() to gracefully handle the NULL (which it does). Reviewed-by: Tomohiro Kusumi Signed-off-by: Brian Behlendorf Closes #8678 --- module/zfs/vdev_disk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c index c2312e6fa..b329ef3c2 100644 --- a/module/zfs/vdev_disk.c +++ b/module/zfs/vdev_disk.c @@ -543,7 +543,6 @@ vdev_bio_associate_blkg(struct bio *bio) struct request_queue *q = bio->bi_disk->queue; ASSERT3P(q, !=, NULL); - ASSERT3P(q->root_blkg, !=, NULL); ASSERT3P(bio->bi_blkg, ==, NULL); if (blkg_tryget(q->root_blkg)) -- 2.39.2