projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop 'size' argument from bio_endio and bi_end_io
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
scsi_lib.c
diff --git
a/drivers/scsi/scsi_lib.c
b/drivers/scsi/scsi_lib.c
index 59b398530295fcb139eca9d0f3fe9c27a20526dc..604f4d7179334a3cb1ce61d354f842285eb2234d 100644
(file)
--- a/
drivers/scsi/scsi_lib.c
+++ b/
drivers/scsi/scsi_lib.c
@@
-266,13
+266,9
@@
static int scsi_merge_bio(struct request *rq, struct bio *bio)
return blk_rq_append_bio(q, rq, bio);
}
return blk_rq_append_bio(q, rq, bio);
}
-static
int scsi_bi_endio(struct bio *bio, unsigned int bytes_done
, int error)
+static
void scsi_bi_endio(struct bio *bio
, int error)
{
{
- if (bio->bi_size)
- return 1;
-
bio_put(bio);
bio_put(bio);
- return 0;
}
/**
}
/**
@@
-328,7
+324,7
@@
static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl,
if (bio->bi_vcnt >= nr_vecs) {
err = scsi_merge_bio(rq, bio);
if (err) {
if (bio->bi_vcnt >= nr_vecs) {
err = scsi_merge_bio(rq, bio);
if (err) {
- bio_endio(bio,
bio->bi_size,
0);
+ bio_endio(bio, 0);
goto free_bios;
}
bio = NULL;
goto free_bios;
}
bio = NULL;
@@
-350,7
+346,7
@@
free_bios:
/*
* call endio instead of bio_put incase it was bounced
*/
/*
* call endio instead of bio_put incase it was bounced
*/
- bio_endio(bio,
bio->bi_size,
0);
+ bio_endio(bio, 0);
}
return err;
}
return err;