| Message ID | 1511271770-3444-2-git-send-email-adrian.hunter@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 21, 2017 at 2:42 PM, Adrian Hunter <adrian.hunter@intel.com> wrote: > Ensure blk_get_request() is paired with blk_put_request(). > > Fixes: 0493f6fe5bde ("mmc: block: Move boot partition locking into a driver op") > Fixes: 627c3ccfb46a ("mmc: debugfs: Move block debugfs into block module") > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Ah, me abusing the APIs, sorry for sloppiness. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Ulf I think this should be queued for fixes. Yours, Linus Walleij
On 21 November 2017 at 14:42, Adrian Hunter <adrian.hunter@intel.com> wrote: > Ensure blk_get_request() is paired with blk_put_request(). > > Fixes: 0493f6fe5bde ("mmc: block: Move boot partition locking into a driver op") > Fixes: 627c3ccfb46a ("mmc: debugfs: Move block debugfs into block module") > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Thanks, applied for fixes and added a stable tag! Kind regards Uffe > --- > drivers/mmc/core/block.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index ea80ff4cd7f9..f60939858586 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -236,6 +236,7 @@ static ssize_t power_ro_lock_store(struct device *dev, > req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_BOOT_WP; > blk_execute_rq(mq->queue, NULL, req, 0); > ret = req_to_mmc_queue_req(req)->drv_op_result; > + blk_put_request(req); > > if (!ret) { > pr_info("%s: Locking boot partition ro until next power on\n", > @@ -2557,6 +2558,7 @@ static int mmc_dbg_card_status_get(void *data, u64 *val) > *val = ret; > ret = 0; > } > + blk_put_request(req); > > return ret; > } > @@ -2587,6 +2589,7 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) > req_to_mmc_queue_req(req)->drv_op_data = &ext_csd; > blk_execute_rq(mq->queue, NULL, req, 0); > err = req_to_mmc_queue_req(req)->drv_op_result; > + blk_put_request(req); > if (err) { > pr_err("FAILED %d\n", err); > goto out_free; > -- > 1.9.1 >
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index ea80ff4cd7f9..f60939858586 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -236,6 +236,7 @@ static ssize_t power_ro_lock_store(struct device *dev, req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_BOOT_WP; blk_execute_rq(mq->queue, NULL, req, 0); ret = req_to_mmc_queue_req(req)->drv_op_result; + blk_put_request(req); if (!ret) { pr_info("%s: Locking boot partition ro until next power on\n", @@ -2557,6 +2558,7 @@ static int mmc_dbg_card_status_get(void *data, u64 *val) *val = ret; ret = 0; } + blk_put_request(req); return ret; } @@ -2587,6 +2589,7 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) req_to_mmc_queue_req(req)->drv_op_data = &ext_csd; blk_execute_rq(mq->queue, NULL, req, 0); err = req_to_mmc_queue_req(req)->drv_op_result; + blk_put_request(req); if (err) { pr_err("FAILED %d\n", err); goto out_free;
Ensure blk_get_request() is paired with blk_put_request(). Fixes: 0493f6fe5bde ("mmc: block: Move boot partition locking into a driver op") Fixes: 627c3ccfb46a ("mmc: debugfs: Move block debugfs into block module") Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- drivers/mmc/core/block.c | 3 +++ 1 file changed, 3 insertions(+)