projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-4.3-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
block
/
xen-blkfront.c
diff --git
a/drivers/block/xen-blkfront.c
b/drivers/block/xen-blkfront.c
index
5dd591d
..
1508353
100644
(file)
--- a/
drivers/block/xen-blkfront.c
+++ b/
drivers/block/xen-blkfront.c
@@
-83,7
+83,6
@@
struct blk_shadow {
struct split_bio {
struct bio *bio;
atomic_t pending;
struct split_bio {
struct bio *bio;
atomic_t pending;
- int err;
};
static DEFINE_MUTEX(blkfront_mutex);
};
static DEFINE_MUTEX(blkfront_mutex);
@@
-1476,16
+1475,14
@@
static int blkfront_probe(struct xenbus_device *dev,
return 0;
}
return 0;
}
-static void split_bio_end(struct bio *bio
, int error
)
+static void split_bio_end(struct bio *bio)
{
struct split_bio *split_bio = bio->bi_private;
{
struct split_bio *split_bio = bio->bi_private;
- if (error)
- split_bio->err = error;
-
if (atomic_dec_and_test(&split_bio->pending)) {
split_bio->bio->bi_phys_segments = 0;
if (atomic_dec_and_test(&split_bio->pending)) {
split_bio->bio->bi_phys_segments = 0;
- bio_endio(split_bio->bio, split_bio->err);
+ split_bio->bio->bi_error = bio->bi_error;
+ bio_endio(split_bio->bio);
kfree(split_bio);
}
bio_put(bio);
kfree(split_bio);
}
bio_put(bio);