From: Christoph Hellwig Subject: [PATCH 03/14] drbd: remove RB_CONGESTED_REMOTE Date: Sun, 26 Jul 2020 17:03:22 +0200 Message-ID: <20200726150333.305527-4-hch@lst.de> References: <20200726150333.305527-1-hch@lst.de> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit 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=S8Ttwcc94B0Xl9tEeP23NWmZAdd1Fm0GDSqESxJAyFs=; b=YMWzVCgzX29h5w6kZFM6oUoNMr 9gXLP/Ib5QVPfsZG0AAn/rXKE+D/N2C8DnBZzhv3p4q+7Hvzj4rXtmv1GWAV6nNCHkYnow6VnUeGb tfg7+LutO+I7qgJihKfLNV0bioQiwOd7ue+CPYdTYIJKpWq+05hnuInoQy1ujJQexg4BRsGSlIz2Z YZ7J8pfIWExlvsv9pgxeI1cIQvPqFjaJ3zRlmz7+bHnAJieME2sgtOnGvFS+Opg0XaNy/I+HY6ox/ qofchlkyZcbtNwfFSRr4nu6fEXNekMBd5Rs/0KLFlzA4MdQTFmHHa3ICI8wvaZJWqiBY1fFhGVFrd 8CX0M/+w==; In-Reply-To: <20200726150333.305527-1-hch@lst.de> Sender: linux-raid-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Jens Axboe Cc: Song Liu , Hans de Goede , Richard Weinberger , Minchan Kim , linux-mtd@lists.infradead.org, dm-devel@redhat.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, drbd-dev@lists.linbit.com, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, Johannes Thumshirn This case isn't ever used. Signed-off-by: Christoph Hellwig Reviewed-by: Johannes Thumshirn --- drivers/block/drbd/drbd_req.c | 4 ---- include/linux/drbd.h | 1 - 2 files changed, 5 deletions(-) diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 674be09b2da94a..4d944f2eb56efa 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -901,13 +901,9 @@ static bool drbd_may_do_local_read(struct drbd_device *device, sector_t sector, static bool remote_due_to_read_balancing(struct drbd_device *device, sector_t sector, enum drbd_read_balancing rbm) { - struct backing_dev_info *bdi; int stripe_shift; switch (rbm) { - case RB_CONGESTED_REMOTE: - bdi = device->ldev->backing_bdev->bd_disk->queue->backing_dev_info; - return bdi_read_congested(bdi); case RB_LEAST_PENDING: return atomic_read(&device->local_cnt) > atomic_read(&device->ap_pending_cnt) + atomic_read(&device->rs_pending_cnt); diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 5755537b51b114..6a8286132751df 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h @@ -94,7 +94,6 @@ enum drbd_read_balancing { RB_PREFER_REMOTE, RB_ROUND_ROBIN, RB_LEAST_PENDING, - RB_CONGESTED_REMOTE, RB_32K_STRIPING, RB_64K_STRIPING, RB_128K_STRIPING, -- 2.27.0