| Message ID | 1503665035-16231-3-git-send-email-adrian.hunter@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 25 August 2017 at 14:43, Adrian Hunter <adrian.hunter@intel.com> wrote: > Commit 2a842acab109 ("block: introduce new block status code type") changed > the error type but not in patches merged through the mmc tree, like > commit 0493f6fe5bde ("mmc: block: Move boot partition locking into a driver > op"). Fix one error code that is incorrect and also use BLK_STS_OK in > preference to 0. > > Fixes: 17ece345a042 ("Merge tag 'mmc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Thanks, applied for fixes! Kind regards Uffe > --- > drivers/mmc/core/block.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index 0eebc2f726c3..2f00d11adfa9 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -1223,7 +1223,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) > break; > } > mq_rq->drv_op_result = ret; > - blk_end_request_all(req, ret); > + blk_end_request_all(req, ret ? BLK_STS_IOERR : BLK_STS_OK); > } > > static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req) > @@ -1728,9 +1728,9 @@ static bool mmc_blk_rw_cmd_err(struct mmc_blk_data *md, struct mmc_card *card, > if (err) > req_pending = old_req_pending; > else > - req_pending = blk_end_request(req, 0, blocks << 9); > + req_pending = blk_end_request(req, BLK_STS_OK, blocks << 9); > } else { > - req_pending = blk_end_request(req, 0, brq->data.bytes_xfered); > + req_pending = blk_end_request(req, BLK_STS_OK, brq->data.bytes_xfered); > } > return req_pending; > } > -- > 1.9.1 >
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 0eebc2f726c3..2f00d11adfa9 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1223,7 +1223,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) break; } mq_rq->drv_op_result = ret; - blk_end_request_all(req, ret); + blk_end_request_all(req, ret ? BLK_STS_IOERR : BLK_STS_OK); } static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req) @@ -1728,9 +1728,9 @@ static bool mmc_blk_rw_cmd_err(struct mmc_blk_data *md, struct mmc_card *card, if (err) req_pending = old_req_pending; else - req_pending = blk_end_request(req, 0, blocks << 9); + req_pending = blk_end_request(req, BLK_STS_OK, blocks << 9); } else { - req_pending = blk_end_request(req, 0, brq->data.bytes_xfered); + req_pending = blk_end_request(req, BLK_STS_OK, brq->data.bytes_xfered); } return req_pending; }
Commit 2a842acab109 ("block: introduce new block status code type") changed the error type but not in patches merged through the mmc tree, like commit 0493f6fe5bde ("mmc: block: Move boot partition locking into a driver op"). Fix one error code that is incorrect and also use BLK_STS_OK in preference to 0. Fixes: 17ece345a042 ("Merge tag 'mmc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- drivers/mmc/core/block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)