Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936595AbdLRQWH convert rfc822-to-8bit (ORCPT ); Mon, 18 Dec 2017 11:22:07 -0500 Received: from mail-oln040092068035.outbound.protection.outlook.com ([40.92.68.35]:17074 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S936568AbdLRQWC (ORCPT ); Mon, 18 Dec 2017 11:22:02 -0500 From: Chiara Bruschi To: Jens Axboe CC: "linux-block@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "paolo.valente@linaro.org" , "federico@willer.it" , Chiara Bruschi Subject: [PATCH] block, bfq: fix occurrences of request finish method's old name Thread-Topic: [PATCH] block, bfq: fix occurrences of request finish method's old name Thread-Index: AQHTeBxUL5Zh9y2IKkiE4tV4VgCTpA== Date: Mon, 18 Dec 2017 16:21:59 +0000 Message-ID: Accept-Language: it-IT, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:A134CDC96F30EDA5B2260BEAAC7A88C88FAD40D0CA7DE520864451EB4E78F718;UpperCasedChecksum:6154560844E3B0139A3EA02C12F8B853294CE0F4FE90CA3659E39F66291F51C7;SizeAsReceived:7249;Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [/beiHgXy9EhPc/NB5aiAlVx77QZF3Qiq] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VE1EUR02HT103;6:fkzmFbdtlH8ZpFOd/NGeVra1oMs3Tj45Jqu7x9CD7VjmvU+IVCuE9z9DVby0s15SIXn1zr3ZUBT+phhHbY+fZogHYrGnjXuJxn81yjew7uRj2jKhocSYpyobCroSgx2Ik6VcO8xR6XyzRg1WLyaIkGDrBGc+FpU82WRBrLqs/7c22jBbJRMjWrNltsRW4T+rvmxcnSlPXBh84UmzR9SQDOmI0LQSnJ9FNAq4NNv2SUZ9GF70KeYHldsiSPaVv4DGwVIOdIeIGZOAfO6gFtt7is4Enlff6ZT/wkUY6saSE1toWw37zp6vqYaZu2PzOZUXcb+Wv+lcEMdhGGJwY//ONEFRVWQVJsY1uOXaKlFq0O0=;5:Z/lXKS24aW1XfXx5ueTLaRtlItQJ6PaBj7ANI7CenmKtMvDIOTxXUqtpKHzaM5sWQdAxsvmvAoZBPTpU8xVkwVEMtgzqPFaublojKKnFq42BGt/CLUmm/EGEFWpy3znbFnXOBxHY78IDbk5Dyszy8NpRAAS3mD03qTyChS3rkYc=;24:LJcx0HB5f2IJLlG04eZ1oL62qyQ8CwPcb9J5nBiVJQoMZDj+34Y86qlhIE64eo2DaFfe6KDfsvlIWqDlzly8acYDKF197b1WCZIJtXrbj50=;7:2jyChuVqpM1pQrY80yADNZ91fjy5RcWGGsK07XbrWJ6NqqibVuYponQyET2nL1qcbex20YTZRN4DI0MFBBR/FQpFauQArfIDgIz7rygtGJguB3XfmzXCNiZxr2RBX7XBExtsieERkthAF5R9fsXIHdjQEIJOB0x6DRTJSB02tWdiXBaVbnNfEh/fgm4AUPcF79kTVz8ekRDMrDvmPGjAzSpQ6WtTXn83Ou6rPGI5AF1gTugc95cqgBRddcJCIp7G x-incomingheadercount: 45 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125374)(1603101448)(1701031045);SRVR:VE1EUR02HT103; x-ms-traffictypediagnostic: VE1EUR02HT103: x-ms-office365-filtering-correlation-id: 1db77c1e-6ac3-4ed9-c37b-08d546337640 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(444000031);SRVR:VE1EUR02HT103;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:VE1EUR02HT103; x-forefront-prvs: 0525BB0ADF x-forefront-antispam-report: SFV:NSPM;SFS:(7070007)(98901004);DIR:OUT;SFP:1901;SCL:1;SRVR:VE1EUR02HT103;H:DB5PR09MB0263.eurprd09.prod.outlook.com;FPR:;SPF:None;LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1db77c1e-6ac3-4ed9-c37b-08d546337640 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Dec 2017 16:21:59.3713 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR02HT103 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3275 Lines: 83 Commit '7b9e93616399' ("blk-mq-sched: unify request finished methods") changed the old name of current bfq_finish_request method, but left it unchanged elsewhere in the code (related comments, part of function name bfq_put_rq_priv_body). This commit fixes all occurrences of the old name of this method by changing them into the current name. Fixes: 7b9e93616399 ("blk-mq-sched: unify request finished methods") Reviewed-by: Paolo Valente Signed-off-by: Federico Motta Signed-off-by: Chiara Bruschi --- block/bfq-iosched.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index bcb6d21..6da7f71 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3630,8 +3630,8 @@ static struct request *__bfq_dispatch_request(struct blk_mq_hw_ctx *hctx) } /* - * We exploit the put_rq_private hook to decrement - * rq_in_driver, but put_rq_private will not be + * We exploit the bfq_finish_request hook to decrement + * rq_in_driver, but bfq_finish_request will not be * invoked on this request. So, to avoid unbalance, * just start this request, without incrementing * rq_in_driver. As a negative consequence, @@ -3640,14 +3640,14 @@ static struct request *__bfq_dispatch_request(struct blk_mq_hw_ctx *hctx) * bfq_schedule_dispatch to be invoked uselessly. * * As for implementing an exact solution, the - * put_request hook, if defined, is probably invoked - * also on this request. So, by exploiting this hook, - * we could 1) increment rq_in_driver here, and 2) - * decrement it in put_request. Such a solution would - * let the value of the counter be always accurate, - * but it would entail using an extra interface - * function. This cost seems higher than the benefit, - * being the frequency of non-elevator-private + * bfq_finish_request hook, if defined, is probably + * invoked also on this request. So, by exploiting + * this hook, we could 1) increment rq_in_driver here, + * and 2) decrement it in bfq_finish_request. Such a + * solution would let the value of the counter be + * always accurate, but it would entail using an extra + * interface function. This cost seems higher than the + * benefit, being the frequency of non-elevator-private * requests very low. */ goto start_rq; @@ -4482,7 +4482,7 @@ static void bfq_completed_request(struct bfq_queue *bfqq, struct bfq_data *bfqd) bfq_schedule_dispatch(bfqd); } -static void bfq_put_rq_priv_body(struct bfq_queue *bfqq) +static void bfq_finish_request_body(struct bfq_queue *bfqq) { bfqq->allocated--; @@ -4512,7 +4512,7 @@ static void bfq_finish_request(struct request *rq) spin_lock_irqsave(&bfqd->lock, flags); bfq_completed_request(bfqq, bfqd); - bfq_put_rq_priv_body(bfqq); + bfq_finish_request_body(bfqq); spin_unlock_irqrestore(&bfqd->lock, flags); } else { @@ -4533,7 +4533,7 @@ static void bfq_finish_request(struct request *rq) bfqg_stats_update_io_remove(bfqq_group(bfqq), rq->cmd_flags); } - bfq_put_rq_priv_body(bfqq); + bfq_finish_request_body(bfqq); } rq->elv.priv[0] = NULL; -- 2.1.4