Skip to content

Commit cccb493

Browse files
lostjefflesnitm
authored andcommitted
dm table: remove needless request_queue NULL pointer checks
Since commit ff9ea32 ("block, bdi: an active gendisk always has a request_queue associated with it") the request_queue pointer returned from bdev_get_queue() shall never be NULL. Signed-off-by: Jeffle Xu <[email protected]> Signed-off-by: Mike Snitzer <[email protected]>
1 parent 24f6b60 commit cccb493

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

drivers/md/dm-table.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ static int device_not_zoned_model(struct dm_target *ti, struct dm_dev *dev,
13771377
struct request_queue *q = bdev_get_queue(dev->bdev);
13781378
enum blk_zoned_model *zoned_model = data;
13791379

1380-
return !q || blk_queue_zoned_model(q) != *zoned_model;
1380+
return blk_queue_zoned_model(q) != *zoned_model;
13811381
}
13821382

13831383
static bool dm_table_supports_zoned_model(struct dm_table *t,
@@ -1407,7 +1407,7 @@ static int device_not_matches_zone_sectors(struct dm_target *ti, struct dm_dev *
14071407
struct request_queue *q = bdev_get_queue(dev->bdev);
14081408
unsigned int *zone_sectors = data;
14091409

1410-
return !q || blk_queue_zone_sectors(q) != *zone_sectors;
1410+
return blk_queue_zone_sectors(q) != *zone_sectors;
14111411
}
14121412

14131413
static int validate_hardware_zoned_model(struct dm_table *table,
@@ -1556,7 +1556,7 @@ static int device_flush_capable(struct dm_target *ti, struct dm_dev *dev,
15561556
unsigned long flush = (unsigned long) data;
15571557
struct request_queue *q = bdev_get_queue(dev->bdev);
15581558

1559-
return q && (q->queue_flags & flush);
1559+
return (q->queue_flags & flush);
15601560
}
15611561

15621562
static bool dm_table_supports_flush(struct dm_table *t, unsigned long flush)
@@ -1606,23 +1606,23 @@ static int device_is_rotational(struct dm_target *ti, struct dm_dev *dev,
16061606
{
16071607
struct request_queue *q = bdev_get_queue(dev->bdev);
16081608

1609-
return q && !blk_queue_nonrot(q);
1609+
return !blk_queue_nonrot(q);
16101610
}
16111611

16121612
static int device_is_not_random(struct dm_target *ti, struct dm_dev *dev,
16131613
sector_t start, sector_t len, void *data)
16141614
{
16151615
struct request_queue *q = bdev_get_queue(dev->bdev);
16161616

1617-
return q && !blk_queue_add_random(q);
1617+
return !blk_queue_add_random(q);
16181618
}
16191619

16201620
static int device_not_write_same_capable(struct dm_target *ti, struct dm_dev *dev,
16211621
sector_t start, sector_t len, void *data)
16221622
{
16231623
struct request_queue *q = bdev_get_queue(dev->bdev);
16241624

1625-
return q && !q->limits.max_write_same_sectors;
1625+
return !q->limits.max_write_same_sectors;
16261626
}
16271627

16281628
static bool dm_table_supports_write_same(struct dm_table *t)
@@ -1649,7 +1649,7 @@ static int device_not_write_zeroes_capable(struct dm_target *ti, struct dm_dev *
16491649
{
16501650
struct request_queue *q = bdev_get_queue(dev->bdev);
16511651

1652-
return q && !q->limits.max_write_zeroes_sectors;
1652+
return !q->limits.max_write_zeroes_sectors;
16531653
}
16541654

16551655
static bool dm_table_supports_write_zeroes(struct dm_table *t)
@@ -1676,7 +1676,7 @@ static int device_not_nowait_capable(struct dm_target *ti, struct dm_dev *dev,
16761676
{
16771677
struct request_queue *q = bdev_get_queue(dev->bdev);
16781678

1679-
return q && !blk_queue_nowait(q);
1679+
return !blk_queue_nowait(q);
16801680
}
16811681

16821682
static bool dm_table_supports_nowait(struct dm_table *t)
@@ -1703,7 +1703,7 @@ static int device_not_discard_capable(struct dm_target *ti, struct dm_dev *dev,
17031703
{
17041704
struct request_queue *q = bdev_get_queue(dev->bdev);
17051705

1706-
return q && !blk_queue_discard(q);
1706+
return !blk_queue_discard(q);
17071707
}
17081708

17091709
static bool dm_table_supports_discards(struct dm_table *t)
@@ -1737,7 +1737,7 @@ static int device_not_secure_erase_capable(struct dm_target *ti,
17371737
{
17381738
struct request_queue *q = bdev_get_queue(dev->bdev);
17391739

1740-
return q && !blk_queue_secure_erase(q);
1740+
return !blk_queue_secure_erase(q);
17411741
}
17421742

17431743
static bool dm_table_supports_secure_erase(struct dm_table *t)
@@ -1765,7 +1765,7 @@ static int device_requires_stable_pages(struct dm_target *ti,
17651765
{
17661766
struct request_queue *q = bdev_get_queue(dev->bdev);
17671767

1768-
return q && blk_queue_stable_writes(q);
1768+
return blk_queue_stable_writes(q);
17691769
}
17701770

17711771
void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,

0 commit comments

Comments
 (0)