projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: make generic_make_request handle arbitrarily sized bios
[cascardo/linux.git]
/
drivers
/
block
/
rsxx
/
dev.c
diff --git
a/drivers/block/rsxx/dev.c
b/drivers/block/rsxx/dev.c
index
ac8c62c
..
3163e4c
100644
(file)
--- a/
drivers/block/rsxx/dev.c
+++ b/
drivers/block/rsxx/dev.c
@@
-137,7
+137,10
@@
static void bio_dma_done_cb(struct rsxx_cardinfo *card,
if (!card->eeh_state && card->gendisk)
disk_stats_complete(card, meta->bio, meta->start_time);
if (!card->eeh_state && card->gendisk)
disk_stats_complete(card, meta->bio, meta->start_time);
- bio_endio(meta->bio, atomic_read(&meta->error) ? -EIO : 0);
+ if (atomic_read(&meta->error))
+ bio_io_error(meta->bio);
+ else
+ bio_endio(meta->bio);
kmem_cache_free(bio_meta_pool, meta);
}
}
kmem_cache_free(bio_meta_pool, meta);
}
}
@@
-148,6
+151,8
@@
static void rsxx_make_request(struct request_queue *q, struct bio *bio)
struct rsxx_bio_meta *bio_meta;
int st = -EINVAL;
struct rsxx_bio_meta *bio_meta;
int st = -EINVAL;
+ blk_queue_split(q, &bio, q->bio_split);
+
might_sleep();
if (!card)
might_sleep();
if (!card)
@@
-199,7
+204,9
@@
static void rsxx_make_request(struct request_queue *q, struct bio *bio)
queue_err:
kmem_cache_free(bio_meta_pool, bio_meta);
req_err:
queue_err:
kmem_cache_free(bio_meta_pool, bio_meta);
req_err:
- bio_endio(bio, st);
+ if (st)
+ bio->bi_error = st;
+ bio_endio(bio);
}
/*----------------- Device Setup -------------------*/
}
/*----------------- Device Setup -------------------*/