openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtip32xx: update to new ->make_request() API 

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2011-11-05 08:36:21 +01:00
parent 0e838c624e
commit a71f483d79
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/block/mtip32xx/mtip32xx.c
View File

@ -2984,10 +2984,8 @@ static const struct block_device_operations mtip_block_ops = {
* the driver data structure. * the driver data structure.
* @bio Pointer to the BIO. * @bio Pointer to the BIO.
* *
* return value
* 0
*/ */
static int mtip_make_request(struct request_queue *queue, struct bio *bio) static void mtip_make_request(struct request_queue *queue, struct bio *bio)
{ {
struct driver_data *dd = queue->queuedata; struct driver_data *dd = queue->queuedata;
struct scatterlist *sg; struct scatterlist *sg;
@ -2998,12 +2996,12 @@ static int mtip_make_request(struct request_queue *queue, struct bio *bio)
if (unlikely(!bio_has_data(bio))) { if (unlikely(!bio_has_data(bio))) {
blk_queue_flush(queue, 0); blk_queue_flush(queue, 0);
bio_endio(bio, 0); bio_endio(bio, 0);
return 0; return;
} }
if (unlikely(atomic_read(&dd->eh_active))) { if (unlikely(atomic_read(&dd->eh_active))) {
bio_endio(bio, -EBUSY); bio_endio(bio, -EBUSY);
return 0; return;
} }
sg = mtip_hw_get_scatterlist(dd, &tag); sg = mtip_hw_get_scatterlist(dd, &tag);
@ -3015,7 +3013,7 @@ static int mtip_make_request(struct request_queue *queue, struct bio *bio)
"Maximum number of SGL entries exceeded"); "Maximum number of SGL entries exceeded");
bio_io_error(bio); bio_io_error(bio);
mtip_hw_release_scatterlist(dd, tag); mtip_hw_release_scatterlist(dd, tag);
return 0; return;
} }
/* Create the scatter list for this bio. */ /* Create the scatter list for this bio. */
@ -3036,13 +3034,10 @@ static int mtip_make_request(struct request_queue *queue, struct bio *bio)
bio, bio,
bio->bi_rw & REQ_FLUSH, bio->bi_rw & REQ_FLUSH,
bio_data_dir(bio)); bio_data_dir(bio));
} else { } else
bio_io_error(bio); bio_io_error(bio);
} }
return 0;
}
/* /*
* Block layer initialization function. * Block layer initialization function.
* *