From patchwork Fri Jun 30 12:06:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9819467 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28E866035F for ; Fri, 30 Jun 2017 12:10:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AE4D28659 for ; Fri, 30 Jun 2017 12:10:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BD0B2867C; Fri, 30 Jun 2017 12:10:30 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM 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 0305A28669 for ; Fri, 30 Jun 2017 12:10:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751867AbdF3MIu (ORCPT ); Fri, 30 Jun 2017 08:08:50 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:35352 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751817AbdF3MHS (ORCPT ); Fri, 30 Jun 2017 08:07:18 -0400 Received: by mail-lf0-f41.google.com with SMTP id b207so68972530lfg.2 for ; Fri, 30 Jun 2017 05:07:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=RbY4bC/SeC0wuejhgGeaK30nwvkyj8U7rG0F7g0UyEk=; b=fLbClIvKlSfIfCF20xhI3txGaw+VV01r4sTxL2IS016+QEAKZkdTzMbvxeMaV0ehb7 yxVxLO0A0NWvg/LWcZngRycNwDnBgl7ARDkqnajTctnVw9R9HpiSvTJ437Cme21kszli LuCNSccUChvtGquALHBDZyPa2PkXAeysIWZjI= 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; bh=RbY4bC/SeC0wuejhgGeaK30nwvkyj8U7rG0F7g0UyEk=; b=uP8YUSxaxQqTVxjWkYeJMO3U/ZrVH9v3zRJvpGGYblTMMj4XcuWXGaC8IAl+61Wyx6 P1YTGHI7YwjT+9ab6CzXuiL4sAjWovs5gV4NbrDsv/Ots1RGPEy/hxAC6ZZHYnXBThGj 9upz+hfvmAJcIfO/lkG56n6csjEkSHwE98R6BITimegPx4br3yphYZ3HTGEQO5Mu9Z29 Nap/kjlczXlHR3wOJyA0FaC7oeYSY2DYXFzVGgw+PxRgbMJ+/KtRjkuIqEQyFlprH+DF CXhS3xsaaqwP7T6XaFJaRWYqAwEjEsIRfN/YVz44ddAT5XRwwo7XNqwWhbATCpwxoBPI 9klw== X-Gm-Message-State: AKS2vOy6MhkeQxOR7qaKq+w50i9du74FNaBYlZg6Y0hFR0kEiMp7R2Rj EGgQljhlpg4/Pzvw X-Received: by 10.25.153.134 with SMTP id b128mr2785974lfe.90.1498824432029; Fri, 30 Jun 2017 05:07:12 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id 19sm1531492ljv.62.2017.06.30.05.07.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 05:07:10 -0700 (PDT) From: Linus Walleij To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: linux-block@vger.kernel.org, Jens Axboe , Christoph Hellwig , Arnd Bergmann , Bartlomiej Zolnierkiewicz , Paolo Valente , Avri Altman , Adrian Hunter , Linus Walleij Subject: [PATCH 1/3 v4] mmc: block: Anonymize the drv op data pointer Date: Fri, 30 Jun 2017 14:06:47 +0200 Message-Id: <20170630120649.27007-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.4 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 We have a data pointer for the ioctl() data, but we need to pass other data along with the DRV_OP:s, so make this a void * so it can be reused. Signed-off-by: Linus Walleij --- ChangeLog v3->v4: - No changes just resending ChangeLog v2->v3: - No changes just resending --- drivers/mmc/core/block.c | 8 +++++--- drivers/mmc/core/queue.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 3c7efbdc8591..d410f578b8df 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -598,7 +598,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev, __GFP_RECLAIM); idatas[0] = idata; req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_IOCTL; - req_to_mmc_queue_req(req)->idata = idatas; + 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); ioc_err = req_to_mmc_queue_req(req)->drv_op_result; @@ -674,7 +674,7 @@ static int mmc_blk_ioctl_multi_cmd(struct block_device *bdev, idata[0]->ic.write_flag ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN, __GFP_RECLAIM); req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_IOCTL; - req_to_mmc_queue_req(req)->idata = idata; + 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); ioc_err = req_to_mmc_queue_req(req)->drv_op_result; @@ -1175,6 +1175,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) struct mmc_queue_req *mq_rq; struct mmc_card *card = mq->card; struct mmc_blk_data *md = mq->blkdata; + struct mmc_blk_ioc_data **idata; int ret; int i; @@ -1182,8 +1183,9 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) switch (mq_rq->drv_op) { case MMC_DRV_OP_IOCTL: + idata = mq_rq->drv_op_data; for (i = 0; i < mq_rq->ioc_count; i++) { - ret = __mmc_blk_ioctl_cmd(card, md, mq_rq->idata[i]); + ret = __mmc_blk_ioctl_cmd(card, md, idata[i]); if (ret) break; } diff --git a/drivers/mmc/core/queue.h b/drivers/mmc/core/queue.h index 361b46408e0f..cf26a15a64bf 100644 --- a/drivers/mmc/core/queue.h +++ b/drivers/mmc/core/queue.h @@ -51,7 +51,7 @@ struct mmc_queue_req { struct mmc_async_req areq; enum mmc_drv_op drv_op; int drv_op_result; - struct mmc_blk_ioc_data **idata; + void *drv_op_data; unsigned int ioc_count; };