Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <kusumi.tomohiro@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8678
This commit is contained in:
Brian Behlendorf 2019-04-29 18:20:21 -07:00 committed by GitHub
parent b43a27f76f
commit c12ea77865
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/zfs/vdev_disk.c
View File

@ -543,7 +543,6 @@ vdev_bio_associate_blkg(struct bio *bio)
struct request_queue *q = bio->bi_disk->queue; struct request_queue *q = bio->bi_disk->queue;
ASSERT3P(q, !=, NULL); ASSERT3P(q, !=, NULL);
ASSERT3P(q->root_blkg, !=, NULL);
ASSERT3P(bio->bi_blkg, ==, NULL); ASSERT3P(bio->bi_blkg, ==, NULL);
if (blkg_tryget(q->root_blkg)) if (blkg_tryget(q->root_blkg))