[PATCH] memstick: use __blk_end_request to complete requests

Alex Dubov
2008-02-04T04:31:22Z

Signed-off-by: Alex Dubov <oakad@yahoo.com>

--- mspro_block.c.orig 2008-02-04 15:25:16.000000000 +1100
+++ mspro_block.c 2008-02-04 15:26:28.226886699 +1100
@@ -668,20 +668,13 @@

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)

____________________________________________________________________________________
Be a better friend, newshound, and
know-it-all with Yahoo! Mobile. Try it now. http://mobile.yahoo.com/;_ylt=Ahu06i62sR8HDtDypao8Wcj9tAcJ