From patchwork Fri May 8 22:00:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11537683 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A6962186E for ; Fri, 8 May 2020 22:00:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F24324953 for ; Fri, 8 May 2020 22:00:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="FTCqn59Z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727787AbgEHWAX (ORCPT ); Fri, 8 May 2020 18:00:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727774AbgEHWAW (ORCPT ); Fri, 8 May 2020 18:00:22 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8139FC05BD0A for ; Fri, 8 May 2020 15:00:22 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id k1so3650655wrx.4 for ; Fri, 08 May 2020 15:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nqYXnG0hXHAuFcgizjaOL1g3/nTuWaq2pTGY70YFO3Y=; b=FTCqn59ZXMOJsVXSlArE/0ZWBGzr2XuYwLeHciwR5qzYZRXhR1EZ6Xfd6b7/r8ih0M CfN1XuLLM8m4AnYPs62BvH51dOTAR5+i1qZePVMFNuxE2GVd9zbIWN8A6W5SngNAMtbM rXu+yWKyHjiBcT5SBjH0ANMY+QMONbTD+tH6p8U1ZVzMs9ozYFw13Ur1sZDtPyNal6uH 0Fa+wXY+SeyfRIIpUvbNP7+2IC8CiFsof1w9hIOZrSKNptintXW2VO0+TOZPoS4I/rdb 4Q7/SUjABCOgY7csXNyxU5xVWEAZcuwTTrxKovuO8/bM3kThIQatghRykiVvYkEk+qrx QtNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nqYXnG0hXHAuFcgizjaOL1g3/nTuWaq2pTGY70YFO3Y=; b=RjFeGHNrnDafp/zYZRyL1oR6U+jhaKRbkkRHtWyGbgNwshMK23ihWQaXIVJEP9XRbO Q3N5Xh/D8A2e+tYoJp9tTJCkTUJoysW+a/6u36+P09MVJrURulM7mDgmOrTPeMIMiklx V+PB6srwfz+n3+ZPBUQhWCpOpAJu/stsSlf2/r3oprLUr1pGwLtcolMeBr9eqMcdZDz6 Y8Yq9VWEZxQKCYsaTnZXYoFfbpVpYzXta3zpDE6WroPLZHx7AGivrrEBFdqmTf6VROgs RSutnNyLwGr0tw0mAnN8ZP4eEHiwyRMQ2QgIWeiu1XfuCBZOjHRPqPZUwRLCwGzkSYA5 4vnQ== X-Gm-Message-State: AGi0PuYM4Vh9dOu0UC4/y688B9vv8MV4QOKNIp2HMSIFqHCn8G41ek0Y rGhcvs+mzJdCkhDBJKt3z3npUw== X-Google-Smtp-Source: APiQypJwRrxLx7KWzivyRTGV5SfN9QEndr8trJgQGYOvCxRWdl1punApZNQc4CEaJ5V0au8REvTl3w== X-Received: by 2002:adf:e64c:: with SMTP id b12mr4983758wrn.131.1588975221056; Fri, 08 May 2020 15:00:21 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:7d6e:af57:ffe:3087]) by smtp.gmail.com with ESMTPSA id h6sm14646878wmf.31.2020.05.08.15.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 15:00:20 -0700 (PDT) From: Guoqing Jiang To: tj@kernel.org, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 1/4] blk-throttle: remove blk_throtl_drain Date: Sat, 9 May 2020 00:00:12 +0200 Message-Id: <20200508220015.11528-2-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200508220015.11528-1-guoqing.jiang@cloud.ionos.com> References: <20200508220015.11528-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org After the commit 5addeae1bedc4 ("blk-cgroup: remove blkcg_drain_queue"), there is no caller of blk_throtl_drain, so let's remove it. Signed-off-by: Guoqing Jiang --- block/blk-throttle.c | 41 ----------------------------------------- block/blk.h | 2 -- 2 files changed, 43 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 98233c9c65a8..0b2ce7fb77a7 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -2380,47 +2380,6 @@ static void tg_drain_bios(struct throtl_service_queue *parent_sq) } } -/** - * blk_throtl_drain - drain throttled bios - * @q: request_queue to drain throttled bios for - * - * Dispatch all currently throttled bios on @q through ->make_request_fn(). - */ -void blk_throtl_drain(struct request_queue *q) - __releases(&q->queue_lock) __acquires(&q->queue_lock) -{ - struct throtl_data *td = q->td; - struct blkcg_gq *blkg; - struct cgroup_subsys_state *pos_css; - struct bio *bio; - int rw; - - rcu_read_lock(); - - /* - * Drain each tg while doing post-order walk on the blkg tree, so - * that all bios are propagated to td->service_queue. It'd be - * better to walk service_queue tree directly but blkg walk is - * easier. - */ - blkg_for_each_descendant_post(blkg, pos_css, td->queue->root_blkg) - tg_drain_bios(&blkg_to_tg(blkg)->service_queue); - - /* finally, transfer bios from top-level tg's into the td */ - tg_drain_bios(&td->service_queue); - - rcu_read_unlock(); - spin_unlock_irq(&q->queue_lock); - - /* all bios now should be in td->service_queue, issue them */ - for (rw = READ; rw <= WRITE; rw++) - while ((bio = throtl_pop_queued(&td->service_queue.queued[rw], - NULL))) - generic_make_request(bio); - - spin_lock_irq(&q->queue_lock); -} - int blk_throtl_init(struct request_queue *q) { struct throtl_data *td; diff --git a/block/blk.h b/block/blk.h index 73bd3b1c6938..997459de47d0 100644 --- a/block/blk.h +++ b/block/blk.h @@ -307,12 +307,10 @@ int create_task_io_context(struct task_struct *task, gfp_t gfp_mask, int node); * Internal throttling interface */ #ifdef CONFIG_BLK_DEV_THROTTLING -extern void blk_throtl_drain(struct request_queue *q); extern int blk_throtl_init(struct request_queue *q); extern void blk_throtl_exit(struct request_queue *q); extern void blk_throtl_register_queue(struct request_queue *q); #else /* CONFIG_BLK_DEV_THROTTLING */ -static inline void blk_throtl_drain(struct request_queue *q) { } static inline int blk_throtl_init(struct request_queue *q) { return 0; } static inline void blk_throtl_exit(struct request_queue *q) { } static inline void blk_throtl_register_queue(struct request_queue *q) { } From patchwork Fri May 8 22:00:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11537685 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C41F1139F for ; Fri, 8 May 2020 22:00:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC04C21974 for ; Fri, 8 May 2020 22:00:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="UIKZzo7p" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727774AbgEHWAY (ORCPT ); Fri, 8 May 2020 18:00:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727110AbgEHWAX (ORCPT ); Fri, 8 May 2020 18:00:23 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EC6DC061A0C for ; Fri, 8 May 2020 15:00:23 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id h9so3660229wrt.0 for ; Fri, 08 May 2020 15:00:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oe6VUiTYsko1zxoPYCZbsMKvQCAiAXB7o0u5C4C7os8=; b=UIKZzo7pCejAlakM2hiG4HdCLnh0Hv+FZak8KGCaKM+kGnJAwThVANiEyWdglZLM+S 5mMMkwn71jUD6RsAml4EzcgJ6KiNqgGjzZHgiQ3yVAUfZmhk8CrdxHId4nqZTZ0AhusB StxzkUdXJGP90As1TH59dsDkU+Nrq4j85tT9qfl/s+RXqPSkcO381Gpj4ufneSi7JSsj 6Hgfboph161R+bTtlnhprm7PnzNrFFpD8mpHtUaJ+sC10PfTO9AtpKULFOz6gU2NsA8S wnhytYR/j1dkQ/aZI6QfE3zD9FrytikTvcrT/u7ruPZpXgS3Mhi17hOn0A3i3q+V52Gq 8cpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oe6VUiTYsko1zxoPYCZbsMKvQCAiAXB7o0u5C4C7os8=; b=JOQen1VXymATL2I6OhWf/NbajNpitRGD0ZxWQHJ3j7u+O4HFn5hJInFfBRcyZX9ysN ZVZ7YdqqUr6OZ337ystjx6BnzMrJhBaCI9Z5XL/uJk0vZUni7OmGEPCwF5ai60J0phX6 V3EFiOro9KAZskvte7/MRrGPgDvQQpA5yY21uUshdZdEjuIzVFJh6MfOpyncgIN6cTpC xgBwsMNXtn2ldtXY+bHMF4Psv4jrZhGHycA0x5sbvIPo+4C7zsqSjITgEGVMoRpybYnP fJOgw0U3LbPP4rU8gUwrA0FOsd/EdQbqhuZDqvrmMSMeTEPS7ihnDTdaQCBoDvsoHDQy saPA== X-Gm-Message-State: AGi0PuZ5gBYJxf04NHJ6xZHsmelR4tQuKAL59NuhwpN/vdKj8AEulIw2 RZKnY7yOGQwO0sASt9fcGgU+mw== X-Google-Smtp-Source: APiQypJmQon21vzDnJA1qjvuqx/qUdbW7qPUG+u5CBe/BtuOAuVSHxiYsvGhy/tK+NKaUFy6zMbGqg== X-Received: by 2002:a5d:6145:: with SMTP id y5mr4748201wrt.195.1588975221983; Fri, 08 May 2020 15:00:21 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:7d6e:af57:ffe:3087]) by smtp.gmail.com with ESMTPSA id h6sm14646878wmf.31.2020.05.08.15.00.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 15:00:21 -0700 (PDT) From: Guoqing Jiang To: tj@kernel.org, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 2/4] blk-throttle: remove tg_drain_bios Date: Sat, 9 May 2020 00:00:13 +0200 Message-Id: <20200508220015.11528-3-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200508220015.11528-1-guoqing.jiang@cloud.ionos.com> References: <20200508220015.11528-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org After blk_throtl_drain is removed, there is no caller of tg_drain_bios, so remove it as well. Signed-off-by: Guoqing Jiang --- block/blk-throttle.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 0b2ce7fb77a7..209fdd8939fb 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -2358,28 +2358,6 @@ void blk_throtl_bio_endio(struct bio *bio) } #endif -/* - * Dispatch all bios from all children tg's queued on @parent_sq. On - * return, @parent_sq is guaranteed to not have any active children tg's - * and all bios from previously active tg's are on @parent_sq->bio_lists[]. - */ -static void tg_drain_bios(struct throtl_service_queue *parent_sq) -{ - struct throtl_grp *tg; - - while ((tg = throtl_rb_first(parent_sq))) { - struct throtl_service_queue *sq = &tg->service_queue; - struct bio *bio; - - throtl_dequeue_tg(tg); - - while ((bio = throtl_peek_queued(&sq->queued[READ]))) - tg_dispatch_one_bio(tg, bio_data_dir(bio)); - while ((bio = throtl_peek_queued(&sq->queued[WRITE]))) - tg_dispatch_one_bio(tg, bio_data_dir(bio)); - } -} - int blk_throtl_init(struct request_queue *q) { struct throtl_data *td; From patchwork Fri May 8 22:00:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11537687 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3DEA6139F for ; Fri, 8 May 2020 22:00:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2691F24958 for ; Fri, 8 May 2020 22:00:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="dUQcdsq4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727110AbgEHWAZ (ORCPT ); Fri, 8 May 2020 18:00:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727828AbgEHWAY (ORCPT ); Fri, 8 May 2020 18:00:24 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56FE1C061A0C for ; Fri, 8 May 2020 15:00:24 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id h4so11748598wmb.4 for ; Fri, 08 May 2020 15:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dPhyON5t2lsnMJZ8HYi8BZ7gzQdWEyhKhPMeJVZANdc=; b=dUQcdsq4s73ekjBnKr6uL+EYjUYek6QBStLy8HUJV0SiYzsM3N3K7iYsKDel+pfhgP WDM2In7qIiPDBRsSfOuvAm8ofB0bJkj1B8lS3ztan7fVynzuYTfKdxqA0bwQwj0xB5uZ HkBTqGamIv3aIqL8VqFYRCiuNgwbc1SulcPVeN63xZ30cvLq1F6Ixs4SVkR753AW5jDW 45jZU3+g7AMe1ltqRboBgcShGyLe6ja1i8QnrPcKgm+XEk5XXgjsKyGpZJGnckaXMw4q CcCpUU+W4llxARrHFqg2hd69tozoZtd/jgn3AI7Y6XE9yUY7n6965AJm/ttoiMKdLLtc n+eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dPhyON5t2lsnMJZ8HYi8BZ7gzQdWEyhKhPMeJVZANdc=; b=ioOoCB7WR3pmn8b96mhfSDrEk0vXjkHm1fXH84EreyRgQBwr1sWmjJ5AHzC2RHL8wU 6tcENsMkQtH7/1FbRW9dabLsnnmE8aY6ocqSPDOQz35sGgpSiwXOsJYGlGowIEz5AXRC gR5LRHZEqur4BJQXM2BTP0QnhJy66utWdjo5tRDAFHR8GZVWpANWe1tHbmdqi+y9R1xC nWoxstW7PZ4GcW80QjZAU8u4byRxy/dcJj2TRuHaKR/vHdVva5Jew4Lj8dMcYrQ3g+Ok DFFan0IsyBVXDjr9M/VXHw3MEfYW7PMuiTyI2nthydMrvlbDPON86giortevnC7gqWcM Z1nA== X-Gm-Message-State: AGi0PubkX8xeGtnjCYGtDC397WCZmQhtgjkTUNOCaepzJPFH7gdBX5xo fOzLNAssY2hPf+cmQIKjDb3f4A== X-Google-Smtp-Source: APiQypJmiYVfsjfkrMaY/y70wh5rMb7vQUrnV/1GacNtlxMPipssrqTcDECB6zeqrq3aHVDymDUVCQ== X-Received: by 2002:a1c:2846:: with SMTP id o67mr17314309wmo.23.1588975223026; Fri, 08 May 2020 15:00:23 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:7d6e:af57:ffe:3087]) by smtp.gmail.com with ESMTPSA id h6sm14646878wmf.31.2020.05.08.15.00.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 15:00:22 -0700 (PDT) From: Guoqing Jiang To: tj@kernel.org, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 3/4] blk-wbt: remove wbt_update_limits Date: Sat, 9 May 2020 00:00:14 +0200 Message-Id: <20200508220015.11528-4-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200508220015.11528-1-guoqing.jiang@cloud.ionos.com> References: <20200508220015.11528-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org No one call this function after commit 2af2783f2ea4f ("rq-qos: get rid of redundant wbt_update_limits()"), so remove it. Signed-off-by: Guoqing Jiang --- block/blk-wbt.c | 8 -------- block/blk-wbt.h | 4 ---- 2 files changed, 12 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 9cb082f38b93..78bb624cce53 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -418,14 +418,6 @@ static void __wbt_update_limits(struct rq_wb *rwb) rwb_wake_all(rwb); } -void wbt_update_limits(struct request_queue *q) -{ - struct rq_qos *rqos = wbt_rq_qos(q); - if (!rqos) - return; - __wbt_update_limits(RQWB(rqos)); -} - u64 wbt_get_min_lat(struct request_queue *q) { struct rq_qos *rqos = wbt_rq_qos(q); diff --git a/block/blk-wbt.h b/block/blk-wbt.h index 8e4e37660971..16bdc85b8df9 100644 --- a/block/blk-wbt.h +++ b/block/blk-wbt.h @@ -88,7 +88,6 @@ static inline unsigned int wbt_inflight(struct rq_wb *rwb) #ifdef CONFIG_BLK_WBT int wbt_init(struct request_queue *); -void wbt_update_limits(struct request_queue *); void wbt_disable_default(struct request_queue *); void wbt_enable_default(struct request_queue *); @@ -108,9 +107,6 @@ static inline int wbt_init(struct request_queue *q) { return -EINVAL; } -static inline void wbt_update_limits(struct request_queue *q) -{ -} static inline void wbt_disable_default(struct request_queue *q) { } From patchwork Fri May 8 22:00:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11537689 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4158B81 for ; Fri, 8 May 2020 22:00:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29754214D8 for ; Fri, 8 May 2020 22:00:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="fdj9m72E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727926AbgEHWA1 (ORCPT ); Fri, 8 May 2020 18:00:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727838AbgEHWA1 (ORCPT ); Fri, 8 May 2020 18:00:27 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95613C061A0C for ; Fri, 8 May 2020 15:00:25 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id k12so11727541wmj.3 for ; Fri, 08 May 2020 15:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2bZEmVPj4bBPSpoxrezTXCxfraC/gVscBnU3FXpehw0=; b=fdj9m72Ets8NDXsiWFaO7GJwzxJsctQZwipDjgjjrqAisSHYUDTubMx2iwb6ZF6wZE HDfLsfdeZoudSXm8OBhapUknILrelw007SvvkN0Z83/elWMsEzQM9hoiK/YUfDTPGz+8 6Ry/cj8maY9eX6iBpRlqNXpBpQRqp4mIr/+C6w3NflOfIWlb+jsRO4I+aK9Rpd/0HSBl Rxk/TOa809u9NPoGKeCZWj8lj4/jgLH65OsWPDEJepHH4Suz6lNEeH2kd8RyQR84Icbq pfgYQYNSzqsfKu7sz8mt8Oc2tER9x8XEYsFYsV5kFxbGwjBTL4yEZRO/G3hP2Gbtnp0x A0+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2bZEmVPj4bBPSpoxrezTXCxfraC/gVscBnU3FXpehw0=; b=a/5sHGwARyYx/rE0yErXkOkf+OVTXraRQzXgdZoybyDM13umrk8b0Xy+5EM7pyeQq9 NO4r8N1f0uoEaVzyOh5ndSbmK+cMcn9dTGSijJ1Kc4rzOy6LK8LHlzrY+8EaU572Y1Ha DRlcu0sS9/gWZ+A6tkloT8q3Cbt64gIwDsIGZwZ2IJ4xbOqjX37LkoKHMSORglrF0Z0Q DJoforxfuU+C+rXGfaEKGd4yyLU06Ci/wXTa6otr5hWsK+vk/gpNE8TkLtcou7UpUgBV jTO/t9bAV45lneoZYe9n8UgdvJNsRpRvY6da2zBpCCBNMNkgkLqLk/b6v3ZA1KDoiWDn TnKQ== X-Gm-Message-State: AGi0PuaT0jUCjIzV52UiMDcoAU+lRbzRFCMn4N002HstENkm7zbZoY4F pZupegRlkeY+0YHm0gU4z8SIoA== X-Google-Smtp-Source: APiQypJKMZoMXF612rYIHvPoDp5Nyo16pxH9Y1FrPnmdSPMAki5tS8NMGZCr1acYa5nOMcDC52GCrw== X-Received: by 2002:a1c:23d4:: with SMTP id j203mr19502504wmj.49.1588975224308; Fri, 08 May 2020 15:00:24 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:7d6e:af57:ffe:3087]) by smtp.gmail.com with ESMTPSA id h6sm14646878wmf.31.2020.05.08.15.00.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 15:00:23 -0700 (PDT) From: Guoqing Jiang To: tj@kernel.org, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 4/4] blk-wbt: rename __wbt_update_limits to wbt_update_limits Date: Sat, 9 May 2020 00:00:15 +0200 Message-Id: <20200508220015.11528-5-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200508220015.11528-1-guoqing.jiang@cloud.ionos.com> References: <20200508220015.11528-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Now let's rename __wbt_update_limits to wbt_update_limits after the previous one is deleted. Signed-off-by: Guoqing Jiang --- block/blk-wbt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 78bb624cce53..0fa615eefd52 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -405,7 +405,7 @@ static void wb_timer_fn(struct blk_stat_callback *cb) rwb_arm_timer(rwb); } -static void __wbt_update_limits(struct rq_wb *rwb) +static void wbt_update_limits(struct rq_wb *rwb) { struct rq_depth *rqd = &rwb->rq_depth; @@ -433,7 +433,7 @@ void wbt_set_min_lat(struct request_queue *q, u64 val) return; RQWB(rqos)->min_lat_nsec = val; RQWB(rqos)->enable_state = WBT_STATE_ON_MANUAL; - __wbt_update_limits(RQWB(rqos)); + wbt_update_limits(RQWB(rqos)); } @@ -677,7 +677,7 @@ static int wbt_data_dir(const struct request *rq) static void wbt_queue_depth_changed(struct rq_qos *rqos) { RQWB(rqos)->rq_depth.queue_depth = blk_queue_depth(rqos->q); - __wbt_update_limits(RQWB(rqos)); + wbt_update_limits(RQWB(rqos)); } static void wbt_exit(struct rq_qos *rqos) @@ -835,7 +835,7 @@ int wbt_init(struct request_queue *q) rwb->enable_state = WBT_STATE_ON_DEFAULT; rwb->wc = 1; rwb->rq_depth.default_depth = RWB_DEF_DEPTH; - __wbt_update_limits(rwb); + wbt_update_limits(rwb); /* * Assign rwb and add the stats callback.