From patchwork Fri Aug 9 10:54:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11086225 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F2E2A1399 for ; Fri, 9 Aug 2019 10:54:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1E5F28A9B for ; Fri, 9 Aug 2019 10:54:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D581028C77; Fri, 9 Aug 2019 10:54:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17ECF28AC8 for ; Fri, 9 Aug 2019 10:54:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405948AbfHIKyU (ORCPT ); Fri, 9 Aug 2019 06:54:20 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:43232 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726037AbfHIKyU (ORCPT ); Fri, 9 Aug 2019 06:54:20 -0400 Received: by mail-ed1-f67.google.com with SMTP id e3so94549781edr.10; Fri, 09 Aug 2019 03:54:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H5XurvOQOZFexbnR2zKf7+V0lcVL5rSNl6BESH2rPC4=; b=RG9D6uR5HZ9BwPKJjVcEuc+a8EUfQ6FBuoTwmiWzc/IzCRO69axkaOfboC24l1EkcP jk7cVId8ks4maLCIPEM9n5MVpDVvQFM87JhEMsurO8W9rAT5tQ/So/7dTdDKOnIK2Ahy pQNH/KebM37B0WthWx7zhFdICiG4I9BuUabQ3xm9gUmlUFw7ds+q+QoaEs0BraT9SgC6 U8yWc9UVmdFBkV1ORrod3ZaN55MJUq29lglY29qABdTfyOfJWRjH1mKnew6s5064VrD0 Bt77tDp8eaH0BW4l7ulZSYCJlJTIESBQqPp3qVfscce8FP+n+SFabveyOaK8eGCHuQlV ea2Q== 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:mime-version:content-transfer-encoding; bh=H5XurvOQOZFexbnR2zKf7+V0lcVL5rSNl6BESH2rPC4=; b=B65+0gu1w+DdfEf38I3ciDc4QSADlef9yMGF1vO/r8j2gZgDPUfw50O8uCW8LxDMrn hhqRiRNB542JjVAy6u8cbHyAAmrruvtG4B8fyEdTOmgiOf1tsELX5i4IjYDELsHCi8A4 rcnDozEenpUQ2cyGWRvdKRZPLZoMNLIU7Tyk7U/4BM1Kr8Ch8hbxizD4wWP+ehG49VE/ G+POXXzfHxsXbwmexFwQMwHcJh2UilM8295c+hgTKQeTQtDGy/nHLCmQKv4y1zXxAl// lxzdeET2L27iBldVYcFZ0ZzZK2RnwNU8RX0tK0spiir+RChO0zrwwvAOTBiPe/wEif6q UysQ== X-Gm-Message-State: APjAAAVPh4pQAQZGus0+T2NJ98wepsR792Pntrsn/MExXoWoQTamEhQ8 QoML63uc2lPLh4+R70uc0yyYQM3LqzqEUA== X-Google-Smtp-Source: APXvYqxQKYXqWN1Vw4R02O4soPR5PrQ/ub8cDL/Q2LdQnDCeOWommtd7ZkCAIGOMu95I4sF16LaZCg== X-Received: by 2002:a50:9918:: with SMTP id k24mr20823245edb.173.1565348057349; Fri, 09 Aug 2019 03:54:17 -0700 (PDT) Received: from continental.suse.de ([177.96.42.43]) by smtp.gmail.com with ESMTPSA id x55sm22289167edm.11.2019.08.09.03.54.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 09 Aug 2019 03:54:16 -0700 (PDT) From: Marcos Paulo de Souza To: linux-kernel@vger.kernel.org Cc: Marcos Paulo de Souza , hch@lst.de, axboe@kernel.dk, linux-block@vger.kernel.org, Keith Busch , Sagi Grimberg , "James E.J. Bottomley" , "Martin K. Petersen" , Doug Gilbert , =?utf-8?q?Kai_M=C3=A4kisara?= , Hannes Reinecke , Omar Sandoval , Ming Lei , Damien Le Moal , Bart Van Assche , linux-nvme@lists.infradead.org (open list:NVM EXPRESS DRIVER), linux-scsi@vger.kernel.org (open list:SCSI SUBSYSTEM), target-devel@vger.kernel.org (open list:SCSI TARGET SUBSYSTEM) Subject: [PATCHv2 1/4] block: Remove request_queue argument from blk_execute_rq_nowait Date: Fri, 9 Aug 2019 07:54:30 -0300 Message-Id: <20190809105433.8946-2-marcos.souza.org@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190809105433.8946-1-marcos.souza.org@gmail.com> References: <20190809105433.8946-1-marcos.souza.org@gmail.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit a1ce35fa4985 ("block: remove dead elevator code") removed code that was using the request_queue argument. This got simplified by calling blk_mq_sched_insert_request which already gets the request_queue from the request being inserted in the scheduler queue for execution. Signed-off-by: Marcos Paulo de Souza --- block/blk-exec.c | 8 +++----- drivers/block/sx8.c | 4 ++-- drivers/nvme/host/core.c | 4 ++-- drivers/nvme/host/lightnvm.c | 2 +- drivers/nvme/host/pci.c | 7 +++---- drivers/scsi/scsi_error.c | 2 +- drivers/scsi/sg.c | 3 +-- drivers/scsi/st.c | 2 +- drivers/target/target_core_pscsi.c | 5 ++--- include/linux/blkdev.h | 4 ++-- 10 files changed, 18 insertions(+), 23 deletions(-) -- 2.22.0 diff --git a/block/blk-exec.c b/block/blk-exec.c index 1db44ca0f4a6..80890b0b9c67 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c @@ -32,7 +32,6 @@ static void blk_end_sync_rq(struct request *rq, blk_status_t error) /** * blk_execute_rq_nowait - insert a request into queue for execution - * @q: queue to insert the request in * @bd_disk: matching gendisk * @rq: request to insert * @at_head: insert request at head or tail of queue @@ -45,9 +44,8 @@ static void blk_end_sync_rq(struct request *rq, blk_status_t error) * Note: * This function will invoke @done directly if the queue is dead. */ -void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, - struct request *rq, int at_head, - rq_end_io_fn *done) +void blk_execute_rq_nowait(struct gendisk *bd_disk, struct request *rq, + int at_head, rq_end_io_fn *done) { WARN_ON(irqs_disabled()); WARN_ON(!blk_rq_is_passthrough(rq)); @@ -81,7 +79,7 @@ void blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk, unsigned long hang_check; rq->end_io_data = &wait; - blk_execute_rq_nowait(q, bd_disk, rq, at_head, blk_end_sync_rq); + blk_execute_rq_nowait(bd_disk, rq, at_head, blk_end_sync_rq); /* Prevent hang_check timer from firing at us during very long I/O */ hang_check = sysctl_hung_task_timeout_secs; diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 4478eb7efee0..2cdf2771f8e8 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -539,7 +539,7 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx) spin_unlock_irq(&host->lock); DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag); - blk_execute_rq_nowait(host->oob_q, NULL, rq, true, NULL); + blk_execute_rq_nowait(NULL, rq, true, NULL); return 0; @@ -578,7 +578,7 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func) crq->msg_bucket = (u32) rc; DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag); - blk_execute_rq_nowait(host->oob_q, NULL, rq, true, NULL); + blk_execute_rq_nowait(NULL, rq, true, NULL); return 0; } diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 8f3fbe5ca937..6682fdcece0f 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -756,7 +756,7 @@ static void nvme_execute_rq_polled(struct request_queue *q, rq->cmd_flags |= REQ_HIPRI; rq->end_io_data = &wait; - blk_execute_rq_nowait(q, bd_disk, rq, at_head, nvme_end_sync_rq); + blk_execute_rq_nowait(bd_disk, rq, at_head, nvme_end_sync_rq); while (!completion_done(&wait)) { blk_poll(q, request_to_qc_t(rq->mq_hctx, rq), true); @@ -941,7 +941,7 @@ static int nvme_keep_alive(struct nvme_ctrl *ctrl) rq->timeout = ctrl->kato * HZ; rq->end_io_data = ctrl; - blk_execute_rq_nowait(rq->q, NULL, rq, 0, nvme_keep_alive_end_io); + blk_execute_rq_nowait(NULL, rq, 0, nvme_keep_alive_end_io); return 0; } diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index ba009d4c9dfa..5d0e330e86d0 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -685,7 +685,7 @@ static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd) rq->end_io_data = rqd; - blk_execute_rq_nowait(q, NULL, rq, 0, nvme_nvm_end_io); + blk_execute_rq_nowait(NULL, rq, 0, nvme_nvm_end_io); return 0; } diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index db160cee42ad..d8f83696b4ba 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1332,7 +1332,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) abort_req->timeout = ADMIN_TIMEOUT; abort_req->end_io_data = NULL; - blk_execute_rq_nowait(abort_req->q, NULL, abort_req, 0, abort_endio); + blk_execute_rq_nowait(NULL, abort_req, 0, abort_endio); /* * The aborted req will be completed on receiving the abort req. @@ -2205,9 +2205,8 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode) req->end_io_data = nvmeq; init_completion(&nvmeq->delete_done); - blk_execute_rq_nowait(q, NULL, req, false, - opcode == nvme_admin_delete_cq ? - nvme_del_cq_end : nvme_del_queue_end); + blk_execute_rq_nowait(NULL, req, false, + opcode == nvme_admin_delete_cq ? nvme_del_cq_end : nvme_del_queue_end); return 0; } diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 1c470e31ae81..49cda23c7fb8 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -1988,7 +1988,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) req->timeout = 10 * HZ; rq->retries = 5; - blk_execute_rq_nowait(req->q, NULL, req, 1, eh_lock_door_done); + blk_execute_rq_nowait(NULL, req, 1, eh_lock_door_done); } /** diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index cce757506383..81ece3ed0474 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -835,8 +835,7 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp, srp->rq->timeout = timeout; kref_get(&sfp->f_ref); /* sg_rq_end_io() does kref_put(). */ - blk_execute_rq_nowait(sdp->device->request_queue, sdp->disk, - srp->rq, at_head, sg_rq_end_io); + blk_execute_rq_nowait(sdp->disk, srp->rq, at_head, sg_rq_end_io); return 0; } diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index e3266a64a477..3b828f260294 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -583,7 +583,7 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd, rq->retries = retries; req->end_io_data = SRpnt; - blk_execute_rq_nowait(req->q, NULL, req, 1, st_scsi_execute_end); + blk_execute_rq_nowait(NULL, req, 1, st_scsi_execute_end); return 0; } diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index c9d92b3e777d..021212569d1b 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -1000,9 +1000,8 @@ pscsi_execute_cmd(struct se_cmd *cmd) req->timeout = PS_TIMEOUT_OTHER; scsi_req(req)->retries = PS_RETRY; - blk_execute_rq_nowait(pdv->pdv_sd->request_queue, NULL, req, - (cmd->sam_task_attr == TCM_HEAD_TAG), - pscsi_req_done); + blk_execute_rq_nowait(NULL, req, (cmd->sam_task_attr == TCM_HEAD_TAG), + pscsi_req_done); return 0; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 1ef375dafb1c..8e8f088c75a5 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -867,8 +867,8 @@ extern int blk_rq_map_user_iov(struct request_queue *, struct request *, gfp_t); extern void blk_execute_rq(struct request_queue *, struct gendisk *, struct request *, int); -extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *, - struct request *, int, rq_end_io_fn *); +extern void blk_execute_rq_nowait(struct gendisk *, struct request *, int, + rq_end_io_fn *); /* Helper to convert REQ_OP_XXX to its string format XXX */ extern const char *blk_op_str(unsigned int op); From patchwork Fri Aug 9 10:54:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11086231 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6EFD713B1 for ; Fri, 9 Aug 2019 10:54:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FE0E28A99 for ; Fri, 9 Aug 2019 10:54:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5382628AC8; Fri, 9 Aug 2019 10:54:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4560F28A99 for ; Fri, 9 Aug 2019 10:54:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406261AbfHIKyk (ORCPT ); Fri, 9 Aug 2019 06:54:40 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:41550 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726037AbfHIKyk (ORCPT ); Fri, 9 Aug 2019 06:54:40 -0400 Received: by mail-ed1-f66.google.com with SMTP id w5so5958624edl.8; Fri, 09 Aug 2019 03:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tzZxle7lNkZ9B4/i4Gon6TBKR47JpvPvE4izkujl8YM=; b=EkOM5lkgvLyrjTYeM9Q7a0FqxbVuO4OLbMogFhnoh6esvWygzKw6beBCaUDrV7NZQx uYJd2ma6KZzcuv8Vsq+3dbay0wv/3tjpAOQ3AIrCfLyexobtMD9L0PzaADFGeYz4ou7r dDDqNdTF89MI/S+9uUcPm8SpFIk/+xMgVbulDgmSKRn8jIfLOqjAy1XntAfv+miJvuky v9IdDoZe+huJqKLktnEphTZDwMwDrNrd2oeCnpD0Fi+Ba8gE3rNcFGNdpYA2LLi6kylz KfLRNpWrtT0LMCWdXa71xQroh4f76T8sAIeOjY1ZtMDQOX+qDB1Mq/Negx6JtGngKhEx q8dA== 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:mime-version:content-transfer-encoding; bh=tzZxle7lNkZ9B4/i4Gon6TBKR47JpvPvE4izkujl8YM=; b=nJtBHk/Z6J0K8YJpQEKSBOvxWaoYUaYAsSWAfVr7OG+QtuxswTvAaap5HFgL7yMn/f AcJ2xWVPu2hVkJxtSoEhVC/rKdA7r6DZU0Z0VqksMsp6p5XhQ8Em2Cc+6dUXJZuXIAyY vAd6NnA5QntYfArjwOVGtyjFYuorftxkZIdo3lb+RMqv19zjVitSuDHKPuCMNQNszysv stYqVS/NZyrkkmnTdkU0NuEKybKqQhCWB7ZxEdku8aphgliBjLGGr/ytelwepZx+dNAQ eX0UYMei8omI0FSm07O5vwTT50YKmf50iU9BwW4AmGpe9thQiiOxyRRzdsL2TCtvhEqx yvRQ== X-Gm-Message-State: APjAAAVO+Ge+TQ3vu79UQAru4/IAwi+BI6g8cjoJc3lwg4cytHMFxIx2 bl4N+mjLIi+atlWsDXjVX8zId1cAhiPCUw== X-Google-Smtp-Source: APXvYqyYRnt2CBmgFNhC8PE+CdaVR7Y/y7lKJiovfOr3eSwTbHKe7RhQ/18rruyiHkafJgBn6JiW7g== X-Received: by 2002:a50:b87c:: with SMTP id k57mr20712295ede.226.1565348076039; Fri, 09 Aug 2019 03:54:36 -0700 (PDT) Received: from continental.suse.de ([177.96.42.43]) by smtp.gmail.com with ESMTPSA id x55sm22289167edm.11.2019.08.09.03.54.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 09 Aug 2019 03:54:35 -0700 (PDT) From: Marcos Paulo de Souza To: linux-kernel@vger.kernel.org Cc: Marcos Paulo de Souza , hch@lst.de, axboe@kernel.dk, linux-block@vger.kernel.org, FUJITA Tomonori , Tim Waugh , "Michael S. Tsirkin" , Jason Wang , Paolo Bonzini , Stefan Hajnoczi , "David S. Miller" , Borislav Petkov , Ulf Hansson , Keith Busch , Sagi Grimberg , "James E.J. Bottomley" , "Martin K. Petersen" , "J. Bruce Fields" , Chuck Lever , Hannes Reinecke , Johannes Thumshirn , Matthew Wilcox , Avri Altman , Wolfram Sang , Ming Lei , YueHaibing , Chris Boot , Zachary Hays , Omar Sandoval , Chaitanya Kulkarni , Damien Le Moal , Bart Van Assche , linux-scsi@vger.kernel.org (open list:BSG (block layer generic sg v4 driver)), virtualization@lists.linux-foundation.org (open list:VIRTIO BLOCK AND SCSI DRIVERS), linux-ide@vger.kernel.org (open list:IDE SUBSYSTEM), linux-mmc@vger.kernel.org (open list:MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND...), linux-nvme@lists.infradead.org (open list:NVM EXPRESS DRIVER), linux-nfs@vger.kernel.org (open list:KERNEL NFSD, SUNRPC, AND LOCKD SERVERS) Subject: [PATCHv2 2/4] fs/block/drivers: Remove request_queue argument from blk_execute_rq Date: Fri, 9 Aug 2019 07:54:31 -0300 Message-Id: <20190809105433.8946-3-marcos.souza.org@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190809105433.8946-1-marcos.souza.org@gmail.com> References: <20190809105433.8946-1-marcos.souza.org@gmail.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The only user of the request_queue argument was removed in commit 552cef2b8b03 ("block: Remove request_queue argument from blk_execute_rq_nowait"), so now we can safely removed the same argument from blk_execute_rq and all places that calls this function. Signed-off-by: Marcos Paulo de Souza --- block/blk-exec.c | 4 +--- block/bsg.c | 2 +- block/scsi_ioctl.c | 6 +++--- drivers/block/mtip32xx/mtip32xx.c | 2 +- drivers/block/paride/pd.c | 2 +- drivers/block/pktcdvd.c | 2 +- drivers/block/virtio_blk.c | 2 +- drivers/cdrom/cdrom.c | 2 +- drivers/ide/ide-atapi.c | 2 +- drivers/ide/ide-cd.c | 2 +- drivers/ide/ide-cd_ioctl.c | 2 +- drivers/ide/ide-devsets.c | 2 +- drivers/ide/ide-disk.c | 2 +- drivers/ide/ide-ioctls.c | 4 ++-- drivers/ide/ide-park.c | 2 +- drivers/ide/ide-pm.c | 4 ++-- drivers/ide/ide-tape.c | 2 +- drivers/ide/ide-taskfile.c | 2 +- drivers/mmc/core/block.c | 10 +++++----- drivers/nvme/host/core.c | 4 ++-- drivers/nvme/host/lightnvm.c | 4 ++-- drivers/scsi/scsi_lib.c | 2 +- fs/nfsd/blocklayout.c | 2 +- include/linux/blkdev.h | 3 +-- 24 files changed, 34 insertions(+), 37 deletions(-) -- 2.22.0 diff --git a/block/blk-exec.c b/block/blk-exec.c index 80890b0b9c67..7862f8be39d1 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c @@ -63,7 +63,6 @@ EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); /** * blk_execute_rq - insert a request into queue for execution - * @q: queue to insert the request in * @bd_disk: matching gendisk * @rq: request to insert * @at_head: insert request at head or tail of queue @@ -72,8 +71,7 @@ EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); * Insert a fully prepared request at the back of the I/O scheduler queue * for execution and wait for completion. */ -void blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk, - struct request *rq, int at_head) +void blk_execute_rq(struct gendisk *bd_disk, struct request *rq, int at_head) { DECLARE_COMPLETION_ONSTACK(wait); unsigned long hang_check; diff --git a/block/bsg.c b/block/bsg.c index 833c44b3d458..180c26ea131d 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -181,7 +181,7 @@ static int bsg_sg_io(struct request_queue *q, fmode_t mode, void __user *uarg) bio = rq->bio; - blk_execute_rq(q, NULL, rq, !(hdr.flags & BSG_FLAG_Q_AT_TAIL)); + blk_execute_rq(NULL, rq, !(hdr.flags & BSG_FLAG_Q_AT_TAIL)); ret = rq->q->bsg_dev.ops->complete_rq(rq, &hdr); blk_rq_unmap_user(bio); diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index f5e0ad65e86a..5411fb322c56 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -354,7 +354,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, * (if he doesn't check that is his problem). * N.B. a non-zero SCSI status is _not_ necessarily an error. */ - blk_execute_rq(q, bd_disk, rq, at_head); + blk_execute_rq(bd_disk, rq, at_head); hdr->duration = jiffies_to_msecs(jiffies - start_time); @@ -490,7 +490,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, goto error; } - blk_execute_rq(q, disk, rq, 0); + blk_execute_rq(disk, rq, 0); err = req->result & 0xff; /* only 8 bit SCSI status */ if (err) { @@ -529,7 +529,7 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk, scsi_req(rq)->cmd[0] = cmd; scsi_req(rq)->cmd[4] = data; scsi_req(rq)->cmd_len = 6; - blk_execute_rq(q, bd_disk, rq, 0); + blk_execute_rq(bd_disk, rq, 0); err = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 964f78cfffa0..707c2a21d75e 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -1014,7 +1014,7 @@ static int mtip_exec_internal_command(struct mtip_port *port, rq->timeout = timeout; /* insert request and run queue */ - blk_execute_rq(rq->q, NULL, rq, true); + blk_execute_rq(NULL, rq, true); if (int_cmd->status) { dev_err(&dd->pdev->dev, "Internal command [%02X] failed %d\n", diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index 6f9ad3fc716f..22f36dc28018 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c @@ -781,7 +781,7 @@ static int pd_special_command(struct pd_unit *disk, req = blk_mq_rq_to_pdu(rq); req->func = func; - blk_execute_rq(disk->gd->queue, disk->gd, rq, 0); + blk_execute_rq(disk->gd, rq, 0); blk_put_request(rq); return 0; } diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 024060165afa..00b0aa14ca07 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -722,7 +722,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * if (cgc->quiet) rq->rq_flags |= RQF_QUIET; - blk_execute_rq(rq->q, pd->bdev->bd_disk, rq, 0); + blk_execute_rq(pd->bdev->bd_disk, rq, 0); if (scsi_req(rq)->result) ret = -EIO; out: diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 7ffd719d89de..e84aefc89780 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -374,7 +374,7 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) if (err) goto out; - blk_execute_rq(vblk->disk->queue, vblk->disk, req, false); + blk_execute_rq(vblk->disk, req, false); err = blk_status_to_errno(virtblk_result(blk_mq_rq_to_pdu(req))); out: blk_put_request(req); diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index ac42ae4651ce..fa85c6ab4915 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -2221,7 +2221,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, rq->timeout = 60 * HZ; bio = rq->bio; - blk_execute_rq(q, cdi->disk, rq, 0); + blk_execute_rq(cdi->disk, rq, 0); if (scsi_req(rq)->result) { struct scsi_sense_hdr sshdr; diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 80bc3bf82f4d..f3e5f25e4065 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -107,7 +107,7 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk, memcpy(scsi_req(rq)->cmd, pc->c, 12); if (drive->media == ide_tape) scsi_req(rq)->cmd[13] = REQ_IDETAPE_PC1; - blk_execute_rq(drive->queue, disk, rq, 0); + blk_execute_rq(disk, rq, 0); error = scsi_req(rq)->result ? -EIO : 0; put_req: blk_put_request(rq); diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 9d117936bee1..31a6d1af0c2f 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -466,7 +466,7 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd, } } - blk_execute_rq(drive->queue, info->disk, rq, 0); + blk_execute_rq(info->disk, rq, 0); error = scsi_req(rq)->result ? -EIO : 0; if (buffer) diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c index 46f2df288c6a..011eab9c69b7 100644 --- a/drivers/ide/ide-cd_ioctl.c +++ b/drivers/ide/ide-cd_ioctl.c @@ -299,7 +299,7 @@ int ide_cdrom_reset(struct cdrom_device_info *cdi) rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, 0); ide_req(rq)->type = ATA_PRIV_MISC; rq->rq_flags = RQF_QUIET; - blk_execute_rq(drive->queue, cd->disk, rq, 0); + blk_execute_rq(cd->disk, rq, 0); ret = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); /* diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c index f2f93ed40356..ca1d4b3d3878 100644 --- a/drivers/ide/ide-devsets.c +++ b/drivers/ide/ide-devsets.c @@ -173,7 +173,7 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting, *(int *)&scsi_req(rq)->cmd[1] = arg; ide_req(rq)->special = setting->set; - blk_execute_rq(q, NULL, rq, 0); + blk_execute_rq(NULL, rq, 0); ret = scsi_req(rq)->result; blk_put_request(rq); diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 197912af5c2f..ffb42a566c2b 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -482,7 +482,7 @@ static int set_multcount(ide_drive_t *drive, int arg) drive->mult_req = arg; drive->special_flags |= IDE_SFLAG_SET_MULTMODE; - blk_execute_rq(drive->queue, NULL, rq, 0); + blk_execute_rq(NULL, rq, 0); blk_put_request(rq); return (drive->mult_count == arg) ? 0 : -EIO; diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c index d48c17003874..45a313cd8698 100644 --- a/drivers/ide/ide-ioctls.c +++ b/drivers/ide/ide-ioctls.c @@ -128,7 +128,7 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg) rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, 0); ide_req(rq)->type = ATA_PRIV_TASKFILE; - blk_execute_rq(drive->queue, NULL, rq, 0); + blk_execute_rq(NULL, rq, 0); err = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); @@ -227,7 +227,7 @@ static int generic_drive_reset(ide_drive_t *drive) ide_req(rq)->type = ATA_PRIV_MISC; scsi_req(rq)->cmd_len = 1; scsi_req(rq)->cmd[0] = REQ_DRIVE_RESET; - blk_execute_rq(drive->queue, NULL, rq, 1); + blk_execute_rq(NULL, rq, 1); ret = scsi_req(rq)->result; blk_put_request(rq); return ret; diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c index 8af7af6001eb..a80a0f28f7b9 100644 --- a/drivers/ide/ide-park.c +++ b/drivers/ide/ide-park.c @@ -37,7 +37,7 @@ static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout) scsi_req(rq)->cmd_len = 1; ide_req(rq)->type = ATA_PRIV_MISC; ide_req(rq)->special = &timeout; - blk_execute_rq(q, NULL, rq, 1); + blk_execute_rq(NULL, rq, 1); rc = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); if (rc) diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c index 192e6c65d34e..fc3cb37fec14 100644 --- a/drivers/ide/ide-pm.c +++ b/drivers/ide/ide-pm.c @@ -27,7 +27,7 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg) mesg.event = PM_EVENT_FREEZE; rqpm.pm_state = mesg.event; - blk_execute_rq(drive->queue, NULL, rq, 0); + blk_execute_rq(NULL, rq, 0); ret = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); @@ -50,7 +50,7 @@ static int ide_pm_execute_rq(struct request *rq) blk_mq_end_request(rq, BLK_STS_OK); return -ENXIO; } - blk_execute_rq(q, NULL, rq, true); + blk_execute_rq(NULL, rq, true); return scsi_req(rq)->result ? -EIO : 0; } diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index db1a65f4b490..56f66cb0d6b6 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c @@ -867,7 +867,7 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int size) goto out_put; } - blk_execute_rq(drive->queue, tape->disk, rq, 0); + blk_execute_rq(tape->disk, rq, 0); /* calculate the number of transferred bytes and update buffer state */ size -= scsi_req(rq)->resid_len; diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index aab6a10435b6..577e34b80244 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c @@ -444,7 +444,7 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf, ide_req(rq)->special = cmd; cmd->rq = rq; - blk_execute_rq(drive->queue, NULL, rq, 0); + blk_execute_rq(NULL, rq, 0); error = scsi_req(rq)->result ? -EIO : 0; put_req: blk_put_request(rq); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 2c71a434c915..7cba68054435 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -249,7 +249,7 @@ static ssize_t power_ro_lock_store(struct device *dev, goto out_put; } req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_BOOT_WP; - blk_execute_rq(mq->queue, NULL, req, 0); + blk_execute_rq(NULL, req, 0); ret = req_to_mmc_queue_req(req)->drv_op_result; blk_put_request(req); @@ -664,7 +664,7 @@ static int mmc_blk_ioctl_cmd(struct mmc_blk_data *md, rpmb ? MMC_DRV_OP_IOCTL_RPMB : MMC_DRV_OP_IOCTL; req_to_mmc_queue_req(req)->drv_op_data = idatas; req_to_mmc_queue_req(req)->ioc_count = 1; - blk_execute_rq(mq->queue, NULL, req, 0); + blk_execute_rq(NULL, req, 0); ioc_err = req_to_mmc_queue_req(req)->drv_op_result; err = mmc_blk_ioctl_copy_to_user(ic_ptr, idata); blk_put_request(req); @@ -733,7 +733,7 @@ static int mmc_blk_ioctl_multi_cmd(struct mmc_blk_data *md, rpmb ? MMC_DRV_OP_IOCTL_RPMB : MMC_DRV_OP_IOCTL; req_to_mmc_queue_req(req)->drv_op_data = idata; req_to_mmc_queue_req(req)->ioc_count = num_of_cmds; - blk_execute_rq(mq->queue, NULL, req, 0); + blk_execute_rq(NULL, req, 0); ioc_err = req_to_mmc_queue_req(req)->drv_op_result; /* copy to user if data and response */ @@ -2752,7 +2752,7 @@ static int mmc_dbg_card_status_get(void *data, u64 *val) if (IS_ERR(req)) return PTR_ERR(req); req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_GET_CARD_STATUS; - blk_execute_rq(mq->queue, NULL, req, 0); + blk_execute_rq(NULL, req, 0); ret = req_to_mmc_queue_req(req)->drv_op_result; if (ret >= 0) { *val = ret; @@ -2791,7 +2791,7 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) } req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_GET_EXT_CSD; req_to_mmc_queue_req(req)->drv_op_data = &ext_csd; - blk_execute_rq(mq->queue, NULL, req, 0); + blk_execute_rq(NULL, req, 0); err = req_to_mmc_queue_req(req)->drv_op_result; blk_put_request(req); if (err) { diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 6682fdcece0f..4a2ed03223b1 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -791,7 +791,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, if (poll) nvme_execute_rq_polled(req->q, NULL, req, at_head); else - blk_execute_rq(req->q, NULL, req, at_head); + blk_execute_rq(NULL, req, at_head); if (result) *result = nvme_req(req)->result; if (nvme_req(req)->flags & NVME_REQ_CANCELLED) @@ -884,7 +884,7 @@ static int nvme_submit_user_cmd(struct request_queue *q, } } - blk_execute_rq(req->q, disk, req, 0); + blk_execute_rq(disk, req, 0); if (nvme_req(req)->flags & NVME_REQ_CANCELLED) ret = -EINTR; else diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 5d0e330e86d0..9c82a5044b75 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -706,7 +706,7 @@ static int nvme_nvm_submit_io_sync(struct nvm_dev *dev, struct nvm_rq *rqd) /* I/Os can fail and the error is signaled through rqd. Callers must * handle the error accordingly. */ - blk_execute_rq(q, NULL, rq, 0); + blk_execute_rq(NULL, rq, 0); if (nvme_req(rq)->flags & NVME_REQ_CANCELLED) ret = -EINTR; @@ -835,7 +835,7 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q, bio->bi_disk = disk; } - blk_execute_rq(q, NULL, rq, 0); + blk_execute_rq(NULL, rq, 0); if (nvme_req(rq)->flags & NVME_REQ_CANCELLED) ret = -EINTR; diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 11e64b50497f..9551bc93ad0c 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -276,7 +276,7 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, /* * head injection *required* here otherwise quiesce won't work */ - blk_execute_rq(req->q, NULL, req, 1); + blk_execute_rq(NULL, req, 1); /* * Some devices (USB mass-storage in particular) may transfer diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c index 66d4c55eb48e..b6fc7f7a0568 100644 --- a/fs/nfsd/blocklayout.c +++ b/fs/nfsd/blocklayout.c @@ -253,7 +253,7 @@ static int nfsd4_scsi_identify_device(struct block_device *bdev, req->cmd[4] = bufflen & 0xff; req->cmd_len = COMMAND_SIZE(INQUIRY); - blk_execute_rq(rq->q, NULL, rq, 1); + blk_execute_rq(NULL, rq, 1); if (req->result) { pr_err("pNFS: INQUIRY 0x83 failed with: %x\n", req->result); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 8e8f088c75a5..c9d9ca686290 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -865,8 +865,7 @@ extern int blk_rq_map_kern(struct request_queue *, struct request *, void *, uns extern int blk_rq_map_user_iov(struct request_queue *, struct request *, struct rq_map_data *, const struct iov_iter *, gfp_t); -extern void blk_execute_rq(struct request_queue *, struct gendisk *, - struct request *, int); +extern void blk_execute_rq(struct gendisk *, struct request *, int); extern void blk_execute_rq_nowait(struct gendisk *, struct request *, int, rq_end_io_fn *); From patchwork Fri Aug 9 10:54:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11086237 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 53DB913B1 for ; Fri, 9 Aug 2019 10:54:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D5A828A99 for ; Fri, 9 Aug 2019 10:54:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EAD628AC8; Fri, 9 Aug 2019 10:54:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B4A628A99 for ; Fri, 9 Aug 2019 10:54:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406368AbfHIKyt (ORCPT ); Fri, 9 Aug 2019 06:54:49 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:35333 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726037AbfHIKyt (ORCPT ); Fri, 9 Aug 2019 06:54:49 -0400 Received: by mail-ed1-f65.google.com with SMTP id w20so94527938edd.2; Fri, 09 Aug 2019 03:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xt0t0Oq4acEqkJbqLnYVPWJEmHrA4PjKK4iicWzZq3o=; b=DZDx2+xmInpW+Kh0ULTjXBkwb9Wip1PO5f/pSyz8d0ghAkjYVaFhef+q9FU60+7G88 oLt7/GikKceBNuaSuI8+SvfLJh6x9U69RAunqqEx6PNbjCnJZkC3tsotSlN6hH8q8AMK ZLmuc0m6StFP5MSAr5nK55X4u8rfTAGI7NNKSKt4JpGwNXLY40Mytuyw2V2Kun0/j/wM QTbclnhwnzv7sVW4RGm7Kx6Lf47tvMcMbL5iOshfnGXW7pYDHGG4yMZi6H9v+l7w09ib 4Cc9JzQwk1jWQMa8GKzHTTQISnxDDjQgBNjN31xTAng8tPE5R64OCn2f5vqU++40TX8E WQ0w== 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:mime-version:content-transfer-encoding; bh=xt0t0Oq4acEqkJbqLnYVPWJEmHrA4PjKK4iicWzZq3o=; b=B5JJW6odqJLIDFYqi1xc37VjsqqzjpoR0VosxNKVQB3g7S7MP3zgub60/6Y4sqTUhw hdype7qfFtQSe+jfcKr+59EzPAqX6JFcDE/ky4UEt6Q2aiJGS8vV8oP7CwT8t1klX88m lGxRN22o1eXQKg4P1sD0dLoKXrpOl8O6eCGgN/5zX19tllmn+XRLvkDTLPPKHA3R4pM7 ts4N+OYNppoLB31VnCo48C2gnMlaBCbq4ZoHiE8/p05Zw4TeEZ7UKjYXy2pmQj2TKmC8 gc/D59rl3woJRebnrmwFUaJqo+Del1/rOOK0Ap+PJBNuTdO107ojCTOyN78wN1sfMUJa iozA== X-Gm-Message-State: APjAAAVPOn8NW3D+FtJweMrcGyLTjfBOAbCqSnLQ1eRWQ97basD2cVAv rcTyZm5oVZG33ee4GVstYKkGUx6vq68jPQ== X-Google-Smtp-Source: APXvYqysaecgybcYmpXFxIi26pt+RPUTBMSRXuXUP90BrN0Ud3f7IHyfp5T7mPAKRtdgXyjfWoUa1Q== X-Received: by 2002:a17:906:60c6:: with SMTP id f6mr12826090ejk.272.1565348085616; Fri, 09 Aug 2019 03:54:45 -0700 (PDT) Received: from continental.suse.de ([177.96.42.43]) by smtp.gmail.com with ESMTPSA id x55sm22289167edm.11.2019.08.09.03.54.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 09 Aug 2019 03:54:45 -0700 (PDT) From: Marcos Paulo de Souza To: linux-kernel@vger.kernel.org Cc: Marcos Paulo de Souza , hch@lst.de, axboe@kernel.dk, linux-block@vger.kernel.org, Keith Busch , Sagi Grimberg , "James E.J. Bottomley" , "Martin K. Petersen" , =?utf-8?q?Kai_M=C3=A4kis?= =?utf-8?q?ara?= , Hannes Reinecke , Omar Sandoval , Ming Lei , Damien Le Moal , Bart Van Assche , linux-nvme@lists.infradead.org (open list:NVM EXPRESS DRIVER), linux-scsi@vger.kernel.org (open list:SCSI SUBSYSTEM) Subject: [PATCHv2 3/4] block: Change at_head argument of blk_execute_rq_nowait to bool Date: Fri, 9 Aug 2019 07:54:32 -0300 Message-Id: <20190809105433.8946-4-marcos.souza.org@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190809105433.8946-1-marcos.souza.org@gmail.com> References: <20190809105433.8946-1-marcos.souza.org@gmail.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Suggested-by: Christoph Hellwig Signed-off-by: Marcos Paulo de Souza --- block/blk-exec.c | 2 +- drivers/nvme/host/core.c | 12 ++++++------ drivers/nvme/host/lightnvm.c | 2 +- drivers/nvme/host/nvme.h | 2 +- drivers/nvme/host/pci.c | 2 +- drivers/scsi/scsi_error.c | 2 +- drivers/scsi/st.c | 2 +- include/linux/blkdev.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) -- 2.22.0 diff --git a/block/blk-exec.c b/block/blk-exec.c index 7862f8be39d1..c8b88f469988 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c @@ -45,7 +45,7 @@ static void blk_end_sync_rq(struct request *rq, blk_status_t error) * This function will invoke @done directly if the queue is dead. */ void blk_execute_rq_nowait(struct gendisk *bd_disk, struct request *rq, - int at_head, rq_end_io_fn *done) + bool at_head, rq_end_io_fn *done) { WARN_ON(irqs_disabled()); WARN_ON(!blk_rq_is_passthrough(rq)); diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 4a2ed03223b1..38c1a5db9e56 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -748,7 +748,7 @@ static void nvme_end_sync_rq(struct request *rq, blk_status_t error) } static void nvme_execute_rq_polled(struct request_queue *q, - struct gendisk *bd_disk, struct request *rq, int at_head) + struct gendisk *bd_disk, struct request *rq, bool at_head) { DECLARE_COMPLETION_ONSTACK(wait); @@ -770,7 +770,7 @@ static void nvme_execute_rq_polled(struct request_queue *q, */ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, union nvme_result *result, void *buffer, unsigned bufflen, - unsigned timeout, int qid, int at_head, + unsigned timeout, int qid, bool at_head, blk_mq_req_flags_t flags, bool poll) { struct request *req; @@ -808,7 +808,7 @@ int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, void *buffer, unsigned bufflen) { return __nvme_submit_sync_cmd(q, cmd, NULL, buffer, bufflen, 0, - NVME_QID_ANY, 0, 0, false); + NVME_QID_ANY, false, 0, false); } EXPORT_SYMBOL_GPL(nvme_submit_sync_cmd); @@ -941,7 +941,7 @@ static int nvme_keep_alive(struct nvme_ctrl *ctrl) rq->timeout = ctrl->kato * HZ; rq->end_io_data = ctrl; - blk_execute_rq_nowait(NULL, rq, 0, nvme_keep_alive_end_io); + blk_execute_rq_nowait(NULL, rq, false, nvme_keep_alive_end_io); return 0; } @@ -1127,7 +1127,7 @@ static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid, c.features.dword11 = cpu_to_le32(dword11); ret = __nvme_submit_sync_cmd(dev->admin_q, &c, &res, - buffer, buflen, 0, NVME_QID_ANY, 0, 0, false); + buffer, buflen, 0, NVME_QID_ANY, false, 0, false); if (ret >= 0 && result) *result = le32_to_cpu(res.u32); return ret; @@ -1871,7 +1871,7 @@ int nvme_sec_submit(void *data, u16 spsp, u8 secp, void *buffer, size_t len, cmd.common.cdw11 = cpu_to_le32(len); return __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, buffer, len, - ADMIN_TIMEOUT, NVME_QID_ANY, 1, 0, false); + ADMIN_TIMEOUT, NVME_QID_ANY, true, 0, false); } EXPORT_SYMBOL_GPL(nvme_sec_submit); #endif /* CONFIG_BLK_SED_OPAL */ diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 9c82a5044b75..c09989376c3b 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -685,7 +685,7 @@ static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd) rq->end_io_data = rqd; - blk_execute_rq_nowait(NULL, rq, 0, nvme_nvm_end_io); + blk_execute_rq_nowait(NULL, rq, false, nvme_nvm_end_io); return 0; } diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 26b563f9985b..f43d0189cba3 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -464,7 +464,7 @@ int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, void *buf, unsigned bufflen); int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, union nvme_result *result, void *buffer, unsigned bufflen, - unsigned timeout, int qid, int at_head, + unsigned timeout, int qid, bool at_head, blk_mq_req_flags_t flags, bool poll); int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid, unsigned int dword11, void *buffer, size_t buflen, diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index d8f83696b4ba..20cbadc7469d 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1332,7 +1332,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) abort_req->timeout = ADMIN_TIMEOUT; abort_req->end_io_data = NULL; - blk_execute_rq_nowait(NULL, abort_req, 0, abort_endio); + blk_execute_rq_nowait(NULL, abort_req, false, abort_endio); /* * The aborted req will be completed on receiving the abort req. diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 49cda23c7fb8..48b1cbb72e32 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -1988,7 +1988,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) req->timeout = 10 * HZ; rq->retries = 5; - blk_execute_rq_nowait(NULL, req, 1, eh_lock_door_done); + blk_execute_rq_nowait(NULL, req, false, eh_lock_door_done); } /** diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 3b828f260294..1d81125f8d35 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -583,7 +583,7 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd, rq->retries = retries; req->end_io_data = SRpnt; - blk_execute_rq_nowait(NULL, req, 1, st_scsi_execute_end); + blk_execute_rq_nowait(NULL, req, true, st_scsi_execute_end); return 0; } diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index c9d9ca686290..19ed996f0074 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -866,7 +866,7 @@ extern int blk_rq_map_user_iov(struct request_queue *, struct request *, struct rq_map_data *, const struct iov_iter *, gfp_t); extern void blk_execute_rq(struct gendisk *, struct request *, int); -extern void blk_execute_rq_nowait(struct gendisk *, struct request *, int, +extern void blk_execute_rq_nowait(struct gendisk *, struct request *, bool, rq_end_io_fn *); /* Helper to convert REQ_OP_XXX to its string format XXX */ From patchwork Fri Aug 9 10:54:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11086245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 46DD013B1 for ; Fri, 9 Aug 2019 10:55:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 363B128A31 for ; Fri, 9 Aug 2019 10:55:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2944B28A9B; Fri, 9 Aug 2019 10:55:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40F8228A31 for ; Fri, 9 Aug 2019 10:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406399AbfHIKzG (ORCPT ); Fri, 9 Aug 2019 06:55:06 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:40174 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406093AbfHIKzG (ORCPT ); Fri, 9 Aug 2019 06:55:06 -0400 Received: by mail-ed1-f68.google.com with SMTP id h8so6403263edv.7; Fri, 09 Aug 2019 03:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IFobf+v5u7ekboCmajvIduUsjW5C7G85pX/gGR/QpIM=; b=tCVqZ9yL9JRYNlLzVmtpUSGoiEHAXl7Gl9ND+MXKzQlU/RUUaM/5bN9Kk7mUzsTTwa yg6TA7AeENPsR/QEcdxMiPFD0Fv2XbGajVMHBCELBf5FHplv06FBVJTyr9DrS/34r2m2 5x5qn1mFKhJzJDhnPwqQlyYlmmnJMDncuNyHf0/agTQ52b0kcOi/7kWEMFIenQRlRj6s hd/46ggl5vja/w8/J2HnFwNsJ0b4wMZGnNNrJZgGvUkZ7MmXqPadFmnTOfAAmxtRP/G0 PID9NT88lIQrwcle3Dof8flzKWwhGRUthpFDrCY+ygjxljm1VgSodK+Qfj+WGlEhKmk5 pXBA== 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:mime-version:content-transfer-encoding; bh=IFobf+v5u7ekboCmajvIduUsjW5C7G85pX/gGR/QpIM=; b=S+jbTMoOH5QdHvAdDhfmiJQIANZ1f8DjiQdZH0KAhgf1OobyBjspOQ0Ga7maSZ0cU7 a9mvL2bo0bwNv1xkjMJlid1F/dLmdgjVf7PfwjmvNfgICLZF2bOdJs2gnd/IlUmbThic Hzy/GEFx3hdCy7ntp5cfwFwNB4/S7LoyBMGAEs0TzFn4eQjXuwWGWuVYpRsoCM2RJ/eU nmZd22GA1/wU7lt+U0lQUCt60iCih+4mCmFNYXqfwyMjjg8NajbzkIFJT0Z9Qxtxa5fV K3B800gvdf3bDuOnABBlA7seUREhyXOBhHVZ23nSLgRlpMOdQGBxHytGyIuvMKlXRoIP Jwaw== X-Gm-Message-State: APjAAAUeZmQi6LruCjv81l0XDOz9cmXYq71Noq1xa7/2NR3yS6CkPE+k atsLSHC+T9Hk7Ki3eRFZJAR37pGEG/t7Ww== X-Google-Smtp-Source: APXvYqx6MCjOzh34eccuqlRuKfyP8sl1s9oDvFEvvd5eq4SJxQXMPvyIgigEYkc1hRt6l/rfQJWTZA== X-Received: by 2002:a50:91e5:: with SMTP id h34mr20734238eda.72.1565348102877; Fri, 09 Aug 2019 03:55:02 -0700 (PDT) Received: from continental.suse.de ([177.96.42.43]) by smtp.gmail.com with ESMTPSA id x55sm22289167edm.11.2019.08.09.03.54.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 09 Aug 2019 03:55:02 -0700 (PDT) From: Marcos Paulo de Souza To: linux-kernel@vger.kernel.org Cc: Marcos Paulo de Souza , hch@lst.de, axboe@kernel.dk, linux-block@vger.kernel.org, Tim Waugh , "David S. Miller" , Borislav Petkov , Ulf Hansson , Keith Busch , Sagi Grimberg , "James E.J. Bottomley" , "Martin K. Petersen" , "J. Bruce Fields" , Chuck Lever , Hannes Reinecke , Avri Altman , YueHaibing , Wolfram Sang , Chris Boot , Zachary Hays , Ming Lei , Omar Sandoval , Damien Le Moal , Bart Van Assche , linux-ide@vger.kernel.org (open list:IDE SUBSYSTEM), linux-mmc@vger.kernel.org (open list:MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND...), linux-nvme@lists.infradead.org (open list:NVM EXPRESS DRIVER), linux-scsi@vger.kernel.org (open list:SCSI SUBSYSTEM), linux-nfs@vger.kernel.org (open list:KERNEL NFSD, SUNRPC, AND LOCKD SERVERS) Subject: [PATCHv2 4/4] block: Change at_head argument of blk_execute_rq to bool Date: Fri, 9 Aug 2019 07:54:33 -0300 Message-Id: <20190809105433.8946-5-marcos.souza.org@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190809105433.8946-1-marcos.souza.org@gmail.com> References: <20190809105433.8946-1-marcos.souza.org@gmail.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Suggested-by: Christoph Hellwig Signed-off-by: Marcos Paulo de Souza --- block/blk-exec.c | 2 +- block/scsi_ioctl.c | 8 ++++---- drivers/block/paride/pd.c | 2 +- drivers/block/pktcdvd.c | 2 +- drivers/cdrom/cdrom.c | 2 +- drivers/ide/ide-atapi.c | 2 +- drivers/ide/ide-cd.c | 2 +- drivers/ide/ide-cd_ioctl.c | 2 +- drivers/ide/ide-devsets.c | 2 +- drivers/ide/ide-disk.c | 2 +- drivers/ide/ide-ioctls.c | 4 ++-- drivers/ide/ide-park.c | 2 +- drivers/ide/ide-pm.c | 2 +- drivers/ide/ide-tape.c | 2 +- drivers/ide/ide-taskfile.c | 2 +- drivers/mmc/core/block.c | 10 +++++----- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/lightnvm.c | 4 ++-- drivers/scsi/scsi_lib.c | 2 +- fs/nfsd/blocklayout.c | 2 +- include/linux/blkdev.h | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) -- 2.22.0 diff --git a/block/blk-exec.c b/block/blk-exec.c index c8b88f469988..dcc4bfb7b981 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c @@ -71,7 +71,7 @@ EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); * Insert a fully prepared request at the back of the I/O scheduler queue * for execution and wait for completion. */ -void blk_execute_rq(struct gendisk *bd_disk, struct request *rq, int at_head) +void blk_execute_rq(struct gendisk *bd_disk, struct request *rq, bool at_head) { DECLARE_COMPLETION_ONSTACK(wait); unsigned long hang_check; diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 5411fb322c56..3231c347ee94 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -281,7 +281,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, unsigned long start_time; ssize_t ret = 0; int writing = 0; - int at_head = 0; + bool at_head = false; struct request *rq; struct scsi_request *req; struct bio *bio; @@ -304,7 +304,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, break; } if (hdr->flags & SG_FLAG_Q_AT_HEAD) - at_head = 1; + at_head = true ret = -ENOMEM; rq = blk_get_request(q, writing ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, 0); @@ -490,7 +490,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, goto error; } - blk_execute_rq(disk, rq, 0); + blk_execute_rq(disk, rq, false); err = req->result & 0xff; /* only 8 bit SCSI status */ if (err) { @@ -529,7 +529,7 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk, scsi_req(rq)->cmd[0] = cmd; scsi_req(rq)->cmd[4] = data; scsi_req(rq)->cmd_len = 6; - blk_execute_rq(bd_disk, rq, 0); + blk_execute_rq(bd_disk, rq, false); err = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index 22f36dc28018..d02c57247c9d 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c @@ -781,7 +781,7 @@ static int pd_special_command(struct pd_unit *disk, req = blk_mq_rq_to_pdu(rq); req->func = func; - blk_execute_rq(disk->gd, rq, 0); + blk_execute_rq(disk->gd, rq, false); blk_put_request(rq); return 0; } diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 00b0aa14ca07..6bd163c4c5c2 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -722,7 +722,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * if (cgc->quiet) rq->rq_flags |= RQF_QUIET; - blk_execute_rq(pd->bdev->bd_disk, rq, 0); + blk_execute_rq(pd->bdev->bd_disk, rq, false); if (scsi_req(rq)->result) ret = -EIO; out: diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index fa85c6ab4915..b5406301e823 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -2221,7 +2221,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, rq->timeout = 60 * HZ; bio = rq->bio; - blk_execute_rq(cdi->disk, rq, 0); + blk_execute_rq(cdi->disk, rq, false); if (scsi_req(rq)->result) { struct scsi_sense_hdr sshdr; diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index f3e5f25e4065..571e30187a0f 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -107,7 +107,7 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk, memcpy(scsi_req(rq)->cmd, pc->c, 12); if (drive->media == ide_tape) scsi_req(rq)->cmd[13] = REQ_IDETAPE_PC1; - blk_execute_rq(disk, rq, 0); + blk_execute_rq(disk, rq, false); error = scsi_req(rq)->result ? -EIO : 0; put_req: blk_put_request(rq); diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 31a6d1af0c2f..3d0dbb11fa8f 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -466,7 +466,7 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd, } } - blk_execute_rq(info->disk, rq, 0); + blk_execute_rq(info->disk, rq, false); error = scsi_req(rq)->result ? -EIO : 0; if (buffer) diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c index 011eab9c69b7..2eed0e43bb2b 100644 --- a/drivers/ide/ide-cd_ioctl.c +++ b/drivers/ide/ide-cd_ioctl.c @@ -299,7 +299,7 @@ int ide_cdrom_reset(struct cdrom_device_info *cdi) rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, 0); ide_req(rq)->type = ATA_PRIV_MISC; rq->rq_flags = RQF_QUIET; - blk_execute_rq(cd->disk, rq, 0); + blk_execute_rq(cd->disk, rq, false); ret = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); /* diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c index ca1d4b3d3878..304df2b35b42 100644 --- a/drivers/ide/ide-devsets.c +++ b/drivers/ide/ide-devsets.c @@ -173,7 +173,7 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting, *(int *)&scsi_req(rq)->cmd[1] = arg; ide_req(rq)->special = setting->set; - blk_execute_rq(NULL, rq, 0); + blk_execute_rq(NULL, rq, false); ret = scsi_req(rq)->result; blk_put_request(rq); diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index ffb42a566c2b..2d2614607df9 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -482,7 +482,7 @@ static int set_multcount(ide_drive_t *drive, int arg) drive->mult_req = arg; drive->special_flags |= IDE_SFLAG_SET_MULTMODE; - blk_execute_rq(NULL, rq, 0); + blk_execute_rq(NULL, rq, false); blk_put_request(rq); return (drive->mult_count == arg) ? 0 : -EIO; diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c index 45a313cd8698..fd861037b723 100644 --- a/drivers/ide/ide-ioctls.c +++ b/drivers/ide/ide-ioctls.c @@ -128,7 +128,7 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg) rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, 0); ide_req(rq)->type = ATA_PRIV_TASKFILE; - blk_execute_rq(NULL, rq, 0); + blk_execute_rq(NULL, rq, false); err = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); @@ -227,7 +227,7 @@ static int generic_drive_reset(ide_drive_t *drive) ide_req(rq)->type = ATA_PRIV_MISC; scsi_req(rq)->cmd_len = 1; scsi_req(rq)->cmd[0] = REQ_DRIVE_RESET; - blk_execute_rq(NULL, rq, 1); + blk_execute_rq(NULL, rq, true); ret = scsi_req(rq)->result; blk_put_request(rq); return ret; diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c index a80a0f28f7b9..0069feb228fd 100644 --- a/drivers/ide/ide-park.c +++ b/drivers/ide/ide-park.c @@ -37,7 +37,7 @@ static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout) scsi_req(rq)->cmd_len = 1; ide_req(rq)->type = ATA_PRIV_MISC; ide_req(rq)->special = &timeout; - blk_execute_rq(NULL, rq, 1); + blk_execute_rq(NULL, rq, true); rc = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); if (rc) diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c index fc3cb37fec14..7c53449dc462 100644 --- a/drivers/ide/ide-pm.c +++ b/drivers/ide/ide-pm.c @@ -27,7 +27,7 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg) mesg.event = PM_EVENT_FREEZE; rqpm.pm_state = mesg.event; - blk_execute_rq(NULL, rq, 0); + blk_execute_rq(NULL, rq, false); ret = scsi_req(rq)->result ? -EIO : 0; blk_put_request(rq); diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 56f66cb0d6b6..484daef19ffe 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c @@ -867,7 +867,7 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int size) goto out_put; } - blk_execute_rq(tape->disk, rq, 0); + blk_execute_rq(tape->disk, rq, false); /* calculate the number of transferred bytes and update buffer state */ size -= scsi_req(rq)->resid_len; diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 577e34b80244..4f9422deaf28 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c @@ -444,7 +444,7 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf, ide_req(rq)->special = cmd; cmd->rq = rq; - blk_execute_rq(NULL, rq, 0); + blk_execute_rq(NULL, rq, false); error = scsi_req(rq)->result ? -EIO : 0; put_req: blk_put_request(rq); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 7cba68054435..2543850aee99 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -249,7 +249,7 @@ static ssize_t power_ro_lock_store(struct device *dev, goto out_put; } req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_BOOT_WP; - blk_execute_rq(NULL, req, 0); + blk_execute_rq(NULL, req, false); ret = req_to_mmc_queue_req(req)->drv_op_result; blk_put_request(req); @@ -664,7 +664,7 @@ static int mmc_blk_ioctl_cmd(struct mmc_blk_data *md, rpmb ? MMC_DRV_OP_IOCTL_RPMB : MMC_DRV_OP_IOCTL; req_to_mmc_queue_req(req)->drv_op_data = idatas; req_to_mmc_queue_req(req)->ioc_count = 1; - blk_execute_rq(NULL, req, 0); + blk_execute_rq(NULL, req, false); ioc_err = req_to_mmc_queue_req(req)->drv_op_result; err = mmc_blk_ioctl_copy_to_user(ic_ptr, idata); blk_put_request(req); @@ -733,7 +733,7 @@ static int mmc_blk_ioctl_multi_cmd(struct mmc_blk_data *md, rpmb ? MMC_DRV_OP_IOCTL_RPMB : MMC_DRV_OP_IOCTL; req_to_mmc_queue_req(req)->drv_op_data = idata; req_to_mmc_queue_req(req)->ioc_count = num_of_cmds; - blk_execute_rq(NULL, req, 0); + blk_execute_rq(NULL, req, false); ioc_err = req_to_mmc_queue_req(req)->drv_op_result; /* copy to user if data and response */ @@ -2752,7 +2752,7 @@ static int mmc_dbg_card_status_get(void *data, u64 *val) if (IS_ERR(req)) return PTR_ERR(req); req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_GET_CARD_STATUS; - blk_execute_rq(NULL, req, 0); + blk_execute_rq(NULL, req, false); ret = req_to_mmc_queue_req(req)->drv_op_result; if (ret >= 0) { *val = ret; @@ -2791,7 +2791,7 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) } req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_GET_EXT_CSD; req_to_mmc_queue_req(req)->drv_op_data = &ext_csd; - blk_execute_rq(NULL, req, 0); + blk_execute_rq(NULL, req, false); err = req_to_mmc_queue_req(req)->drv_op_result; blk_put_request(req); if (err) { diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 38c1a5db9e56..0aa72962f2a7 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -884,7 +884,7 @@ static int nvme_submit_user_cmd(struct request_queue *q, } } - blk_execute_rq(disk, req, 0); + blk_execute_rq(disk, req, false); if (nvme_req(req)->flags & NVME_REQ_CANCELLED) ret = -EINTR; else diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index c09989376c3b..220e34097f94 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -706,7 +706,7 @@ static int nvme_nvm_submit_io_sync(struct nvm_dev *dev, struct nvm_rq *rqd) /* I/Os can fail and the error is signaled through rqd. Callers must * handle the error accordingly. */ - blk_execute_rq(NULL, rq, 0); + blk_execute_rq(NULL, rq, false); if (nvme_req(rq)->flags & NVME_REQ_CANCELLED) ret = -EINTR; @@ -835,7 +835,7 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q, bio->bi_disk = disk; } - blk_execute_rq(NULL, rq, 0); + blk_execute_rq(NULL, rq, false); if (nvme_req(rq)->flags & NVME_REQ_CANCELLED) ret = -EINTR; diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 9551bc93ad0c..b02df7b09312 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -276,7 +276,7 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, /* * head injection *required* here otherwise quiesce won't work */ - blk_execute_rq(NULL, req, 1); + blk_execute_rq(NULL, req, true); /* * Some devices (USB mass-storage in particular) may transfer diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c index b6fc7f7a0568..407b633b7691 100644 --- a/fs/nfsd/blocklayout.c +++ b/fs/nfsd/blocklayout.c @@ -253,7 +253,7 @@ static int nfsd4_scsi_identify_device(struct block_device *bdev, req->cmd[4] = bufflen & 0xff; req->cmd_len = COMMAND_SIZE(INQUIRY); - blk_execute_rq(NULL, rq, 1); + blk_execute_rq(NULL, rq, true); if (req->result) { pr_err("pNFS: INQUIRY 0x83 failed with: %x\n", req->result); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 19ed996f0074..405f8ae31e5c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -865,7 +865,7 @@ extern int blk_rq_map_kern(struct request_queue *, struct request *, void *, uns extern int blk_rq_map_user_iov(struct request_queue *, struct request *, struct rq_map_data *, const struct iov_iter *, gfp_t); -extern void blk_execute_rq(struct gendisk *, struct request *, int); +extern void blk_execute_rq(struct gendisk *, struct request *, bool); extern void blk_execute_rq_nowait(struct gendisk *, struct request *, bool, rq_end_io_fn *);