diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-07-20 15:38:23 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-07-20 15:38:23 -0600 |
| commit | 9caaa66c918c020fd16e84d1c6ebcce9960df1b2 (patch) | |
| tree | 578d455a53453a1aead77da399c5134e73224a66 /drivers/block/drbd/drbd_proc.c | |
| parent | ba47d845d715a010f7b51f6f89bae32845e6acb7 (diff) | |
| parent | ef45fe470e1e5410db4af87abc5d5055427945ac (diff) | |
| download | linux-9caaa66c918c020fd16e84d1c6ebcce9960df1b2.tar.bz2 | |
Merge branch 'for-5.9/block' into for-5.9/block-merge
* for-5.9/block: (124 commits)
blk-cgroup: show global disk stats in root cgroup io.stat
blk-cgroup: make iostat functions visible to stat printing
block: improve discard bio alignment in __blkdev_issue_discard()
block: change REQ_OP_ZONE_RESET and REQ_OP_ZONE_RESET_ALL to be odd numbers
block: defer flush request no matter whether we have elevator
block: make blk_timeout_init() static
block: remove retry loop in ioc_release_fn()
block: remove unnecessary ioc nested locking
block: integrate bd_start_claiming into __blkdev_get
block: use bd_prepare_to_claim directly in the loop driver
block: refactor bd_start_claiming
block: simplify the restart case in __blkdev_get
Revert "blk-rq-qos: remove redundant finish_wait to rq_qos_wait."
block: always remove partitions from blk_drop_partitions()
block: relax jiffies rounding for timeouts
blk-mq: remove redundant validation in __blk_mq_end_request()
blk-mq: Remove unnecessary local variable
writeback: remove bdi->congested_fn
writeback: remove struct bdi_writeback_congested
writeback: remove {set,clear}_wb_congested
...
Diffstat (limited to 'drivers/block/drbd/drbd_proc.c')
| -rw-r--r-- | drivers/block/drbd/drbd_proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c index 1c41cd9982a2..3c0193de2498 100644 --- a/drivers/block/drbd/drbd_proc.c +++ b/drivers/block/drbd/drbd_proc.c @@ -265,7 +265,6 @@ int drbd_seq_show(struct seq_file *seq, void *v) seq_printf(seq, "%2d: cs:Unconfigured\n", i); } else { /* reset device->congestion_reason */ - bdi_rw_congested(device->rq_queue->backing_dev_info); nc = rcu_dereference(first_peer_device(device)->connection->net_conf); wp = nc ? nc->wire_protocol - DRBD_PROT_A + 'A' : ' '; |