The patch titled memstick: use __blk_end_request to complete requests has been added to the -mm tree. Its filename is memstick-use-__blk_end_request-to-complete-requests.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memstick: use __blk_end_request to complete requests From: Alex Dubov <oakad@xxxxxxxxx> Signed-off-by: Alex Dubov <oakad@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/memstick/core/mspro_block.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff -puN drivers/memstick/core/mspro_block.c~memstick-use-__blk_end_request-to-complete-requests drivers/memstick/core/mspro_block.c --- a/drivers/memstick/core/mspro_block.c~memstick-use-__blk_end_request-to-complete-requests +++ a/drivers/memstick/core/mspro_block.c @@ -668,20 +668,13 @@ static void mspro_block_process_request( spin_lock_irqsave(&msb->q_lock, flags); if (rc >= 0) - chunk = end_that_request_chunk(req, 1, rc); + chunk = __blk_end_request(req, 0, rc); else - chunk = end_that_request_first(req, rc, - req->current_nr_sectors); + chunk = __blk_end_request(req, rc, 0); dev_dbg(&card->dev, "end chunk %d, %d\n", rc, chunk); - if (!chunk) { - add_disk_randomness(req->rq_disk); - blkdev_dequeue_request(req); - end_that_request_last(req, rc > 0 ? 1 : rc); - } spin_unlock_irqrestore(&msb->q_lock, flags); } while (chunk); - } static int mspro_block_has_request(struct mspro_block_data *msb) _ Patches currently in -mm which might be from oakad@xxxxxxxxx are origin.patch memstick-initial-commit-for-sony-memorystick-support.patch memstick-initial-commit-for-sony-memorystick-support-fix-2.patch updates-for-the-memstick-driver.patch memstick-use-__blk_end_request-to-complete-requests.patch a.patch memstick-git-busted.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html