diff options
| author | faux123 <reioux@gmail.com> | 2012-02-06 21:55:59 -0800 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-01-08 10:36:29 +0100 |
| commit | f8dec9b4149dd80be163acde7e29213d105132c6 (patch) | |
| tree | 204bb6498eccfed0d77220d1655d453b94ac3b4d /arch | |
| parent | bc657aaabc60b1aa948049d6f8ea9083eabead96 (diff) | |
| download | kernel_samsung_tuna-f8dec9b4149dd80be163acde7e29213d105132c6.zip kernel_samsung_tuna-f8dec9b4149dd80be163acde7e29213d105132c6.tar.gz kernel_samsung_tuna-f8dec9b4149dd80be163acde7e29213d105132c6.tar.bz2 | |
block: remove support for bio remapping from ->make_request
There is very little benefit in allowing to let a ->make_request
instance update the bios device and sector and loop around it in
__generic_make_request when we can archive the same through calling
generic_make_request from the driver and letting the loop in
generic_make_request handle it.
Note that various drivers got the return value from ->make_request and
returned non-zero values for errors.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Conflicts:
block/blk-core.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/staging/zram/zram_drv.c
modified by faux123
Conflicts:
drivers/block/umem.c
Change-Id: I598876e1b7e31f13299512e58e01bb42c7db949d
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/emu/nfblock.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/axonram.c | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c index 48e50f8..e301133 100644 --- a/arch/m68k/emu/nfblock.c +++ b/arch/m68k/emu/nfblock.c @@ -59,7 +59,7 @@ struct nfhd_device { struct gendisk *disk; }; -static int nfhd_make_request(struct request_queue *queue, struct bio *bio) +static void nfhd_make_request(struct request_queue *queue, struct bio *bio) { struct nfhd_device *dev = queue->queuedata; struct bio_vec *bvec; @@ -76,7 +76,6 @@ static int nfhd_make_request(struct request_queue *queue, struct bio *bio) sec += len; } bio_endio(bio, 0); - return 0; } static int nfhd_getgeo(struct block_device *bdev, struct hd_geometry *geo) diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c index bd0d540..2a50506 100644 --- a/arch/powerpc/sysdev/axonram.c +++ b/arch/powerpc/sysdev/axonram.c @@ -104,7 +104,7 @@ axon_ram_irq_handler(int irq, void *dev) * axon_ram_make_request - make_request() method for block device * @queue, @bio: see blk_queue_make_request() */ -static int +static void axon_ram_make_request(struct request_queue *queue, struct bio *bio) { struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data; @@ -113,7 +113,6 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) struct bio_vec *vec; unsigned int transfered; unsigned short idx; - int rc = 0; phys_mem = bank->io_addr + (bio->bi_sector << AXON_RAM_SECTOR_SHIFT); phys_end = bank->io_addr + bank->size; @@ -121,8 +120,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) bio_for_each_segment(vec, bio, idx) { if (unlikely(phys_mem + vec->bv_len > phys_end)) { bio_io_error(bio); - rc = -ERANGE; - break; + return; } user_mem = page_address(vec->bv_page) + vec->bv_offset; @@ -135,8 +133,6 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) transfered += vec->bv_len; } bio_endio(bio, 0); - - return rc; } /** |