From: Christoph Hellwig Subject: [PATCH 02/12] drbd: remove dead code in device_to_statistics Date: Thu, 10 Sep 2020 16:48:22 +0200 Message-ID: <20200910144833.742260-3-hch@lst.de> References: <20200910144833.742260-1-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=iAWmHQBw0kh6rX2xz3yUX0hw8/2a2BhJq7lAu3Cbxmg=; b=IN7JZpI7Qt3jhTw51rzq1KZOe3 8pzQfiHkXBOl9r8YD/Gl8PdSA6lQWae62Sr/jpxPzIHHr5jMwEGCXuazDnNN4wdfSJoo2rjfuNZWX fbxYYNXXs2XXK7lQIJxt9bvqRjAAmCHbm48MDjGyEEAbuVz/AjF3hnZsggGqIaAcCTb9iPlpsY3WF E3WMUtZHDB4PZ/JIt7ZUpPS6ATu29C8u17ncM/42fHEyNAba/0BDVGOyRDn4VuBlkW3Ea/UZ7+TIt lp+eayiIP6umygg7WIuWTolnHvPAhFV3Y7AxHoPywQVRZThTno2G0mMB76A+oP2m04qwuuwud9az0 +vOm6GnA==; In-Reply-To: <20200910144833.742260-1-hch-jcswGhMUV9g@public.gmane.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: drbd-dev-bounces-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org Errors-To: drbd-dev-bounces-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org To: Jens Axboe Cc: linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Hans de Goede , Minchan Kim , Richard Weinberger , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-block-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Song Liu , dm-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org 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 --- 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