android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blk_end_request: changing um (take 4)

Browse Source 
This patch converts um to use blk_end_request interfaces.
Related 'uptodate' arguments are converted to 'error'.

As a result, the interface of internal function, ubd_end_request(),
is changed.

Cc: Jeff Dike <jdike@karaya.com>
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Kiyoshi Ueda 2007-12-11 17:42:53 -05:00 committed by Jens Axboe
parent 650e9cfd14
commit 4898b53a5e
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/um/drivers/ubd_kern.c
View File

@ -475,17 +475,9 @@ static void do_ubd_request(struct request_queue * q);
/* Only changed by ubd_init, which is an initcall. */ /* Only changed by ubd_init, which is an initcall. */
int thread_fd = -1; int thread_fd = -1;
static void ubd_end_request(struct request *req, int bytes, int uptodate) static void ubd_end_request(struct request *req, int bytes, int error)
{ {
if (!end_that_request_first(req, uptodate, bytes >> 9)) { blk_end_request(req, error, bytes);
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);
}
} }
/* Callable only from interrupt context - otherwise you need to do /* Callable only from interrupt context - otherwise you need to do
@ -493,10 +485,10 @@ static void ubd_end_request(struct request *req, int bytes, int uptodate)
static inline void ubd_finish(struct request *req, int bytes) static inline void ubd_finish(struct request *req, int bytes)
{ {
if(bytes < 0){ if(bytes < 0){
ubd_end_request(req, 0, 0); ubd_end_request(req, 0, -EIO);
return; return;
} }
ubd_end_request(req, bytes, 1); ubd_end_request(req, bytes, 0);
} }
static LIST_HEAD(restart); static LIST_HEAD(restart);