| Message ID | 20200910144833.742260-3-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/12] fs: remove the unused SB_I_MULTIROOT flag | expand |
On Thu 10-09-20 16:48:22, Christoph Hellwig wrote: > Ever since the switch to blk-mq, a lower device not used for VM > writeback will not be marked congested, so the check will never > trigger. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks good to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > drivers/block/drbd/drbd_nl.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c > index 43c8ae4d9fca81..aaff5bde391506 100644 > --- a/drivers/block/drbd/drbd_nl.c > +++ b/drivers/block/drbd/drbd_nl.c > @@ -3370,7 +3370,6 @@ static void device_to_statistics(struct device_statistics *s, > if (get_ldev(device)) { > struct drbd_md *md = &device->ldev->md; > u64 *history_uuids = (u64 *)s->history_uuids; > - struct request_queue *q; > int n; > > spin_lock_irq(&md->uuid_lock); > @@ -3384,11 +3383,6 @@ static void device_to_statistics(struct device_statistics *s, > spin_unlock_irq(&md->uuid_lock); > > s->dev_disk_flags = md->flags; > - q = bdev_get_queue(device->ldev->backing_bdev); > - s->dev_lower_blocked = > - bdi_congested(q->backing_dev_info, > - (1 << WB_async_congested) | > - (1 << WB_sync_congested)); > put_ldev(device); > } > s->dev_size = drbd_get_capacity(device->this_bdev); > -- > 2.28.0 >
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 43c8ae4d9fca81..aaff5bde391506 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -3370,7 +3370,6 @@ static void device_to_statistics(struct device_statistics *s, if (get_ldev(device)) { struct drbd_md *md = &device->ldev->md; u64 *history_uuids = (u64 *)s->history_uuids; - struct request_queue *q; int n; spin_lock_irq(&md->uuid_lock); @@ -3384,11 +3383,6 @@ static void device_to_statistics(struct device_statistics *s, spin_unlock_irq(&md->uuid_lock); s->dev_disk_flags = md->flags; - q = bdev_get_queue(device->ldev->backing_bdev); - s->dev_lower_blocked = - bdi_congested(q->backing_dev_info, - (1 << WB_async_congested) | - (1 << WB_sync_congested)); put_ldev(device); } s->dev_size = drbd_get_capacity(device->this_bdev);
Ever since the switch to blk-mq, a lower device not used for VM writeback will not be marked congested, so the check will never trigger. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/block/drbd/drbd_nl.c | 6 ------ 1 file changed, 6 deletions(-)