This patch converts um to use blk_end_request(). Signed-off-by: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx> Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx> --- arch/um/drivers/ubd_kern.c | 10 +--------- 1 files changed, 1 insertion(+), 9 deletions(-) Index: 2.6.24-rc3-mm2/arch/um/drivers/ubd_kern.c =================================================================== --- 2.6.24-rc3-mm2.orig/arch/um/drivers/ubd_kern.c +++ 2.6.24-rc3-mm2/arch/um/drivers/ubd_kern.c @@ -481,15 +481,7 @@ int thread_fd = -1; static void ubd_end_request(struct request *req, int bytes, int uptodate) { - if (!end_that_request_first(req, uptodate, bytes >> 9)) { - struct ubd *dev = req->rq_disk->private_data; - unsigned long flags; - - add_disk_randomness(req->rq_disk); - spin_lock_irqsave(&dev->lock, flags); - end_that_request_last(req, uptodate); - spin_unlock_irqrestore(&dev->lock, flags); - } + blk_end_request(req, uptodate, bytes); } /* Callable only from interrupt context - otherwise you need to do - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html