Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/ata/libata-core.c |    2 +-
 drivers/md/dm-crypt.c     |    4 ++--
 drivers/md/dm.c           |    4 ++--
 drivers/md/raid5.c        |   14 ++++----------
 drivers/scsi/gdth.c       |    2 +-
 drivers/scsi/megaraid.c   |    2 +-
 6 files changed, 11 insertions(+), 17 deletions(-)

diff -puN drivers/ata/libata-core.c~git-block-fixup-1 drivers/ata/libata-core.c
--- a/drivers/ata/libata-core.c~git-block-fixup-1
+++ a/drivers/ata/libata-core.c
@@ -1410,7 +1410,7 @@ static void ata_qc_complete_internal(str
  */
 unsigned ata_exec_internal_sg(struct ata_device *dev,
 			      struct ata_taskfile *tf, const u8 *cdb,
-			      int dma_dir, struct scatterlist *sg,
+			      int dma_dir, struct scatterlist *sgl,
 			      unsigned int n_elem, unsigned long timeout)
 {
 	struct ata_link *link = dev->link;
diff -puN drivers/md/dm-crypt.c~git-block-fixup-1 drivers/md/dm-crypt.c
--- a/drivers/md/dm-crypt.c~git-block-fixup-1
+++ a/drivers/md/dm-crypt.c
@@ -550,12 +550,12 @@ static void crypt_endio(struct bio *clon
 
 	bio_put(clone);
 	kcryptd_queue_crypt(io);
-	return 0;
+	return;
 
 out:
 	bio_put(clone);
 	crypt_dec_pending(io, error);
-	return error;
+	return;
 }
 
 static void clone_init(struct dm_crypt_io *io, struct bio *clone)
diff -puN drivers/md/dm.c~git-block-fixup-1 drivers/md/dm.c
--- a/drivers/md/dm.c~git-block-fixup-1
+++ a/drivers/md/dm.c
@@ -833,7 +833,7 @@ static int dm_request(struct request_que
 
 out_req:
 	if (r < 0)
-		bio_io_error(bio, bio->bi_size);
+		bio_io_error(bio);
 
 	return 0;
 }
@@ -1234,7 +1234,7 @@ static void __flush_deferred_io(struct m
 		n = c->bi_next;
 		c->bi_next = NULL;
 		if (__split_bio(md, c))
-			bio_io_error(c, c->bi_size);
+			bio_io_error(c);
 		c = n;
 	}
 }
diff -puN drivers/md/raid5.c~git-block-fixup-1 drivers/md/raid5.c
--- a/drivers/md/raid5.c~git-block-fixup-1
+++ a/drivers/md/raid5.c
@@ -1673,11 +1673,9 @@ static void raid5_end_read_request(struc
 	clear_bit(R5_LOCKED, &sh->dev[i].flags);
 	set_bit(STRIPE_HANDLE, &sh->state);
 	release_stripe(sh);
-	return 0;
 }
 
-static int raid5_end_write_request (struct bio *bi, unsigned int bytes_done,
-				    int error)
+static void raid5_end_write_request(struct bio *bi, int error)
 {
  	struct stripe_head *sh = bi->bi_private;
 	struct stripe_queue *sq = sh->sq;
@@ -1686,9 +1684,6 @@ static int raid5_end_write_request (stru
 	int uptodate = test_bit(BIO_UPTODATE, &bi->bi_flags);
 	int i;
 
-	if (bi->bi_size)
-		return 1;
-
 	for (i=0 ; i<disks; i++)
 		if (bi == &sh->dev[i].req)
 			break;
@@ -1709,7 +1704,6 @@ static int raid5_end_write_request (stru
 	clear_bit(R5_LOCKED, &sh->dev[i].flags);
 	set_bit(STRIPE_HANDLE, &sh->state);
 	release_stripe(sh);
-	return 0;
 }
 
 static void raid5_build_block (struct stripe_head *sh, int i)
@@ -3862,17 +3856,17 @@ static void raid5_align_endio(struct bio
 	rdev_dec_pending(rdev, conf->mddev);
 
 	if (!error && uptodate) {
-		bio_endio(raid_bi, bytes, 0);
+		bio_endio(raid_bi, 0);
 		if (atomic_dec_and_test(&conf->active_aligned_reads))
 			wake_up(&conf->wait_for_queue);
-		return 0;
+		return;
 	}
 
 
 	pr_debug("raid5_align_endio : io error...handing IO for a retry\n");
 
 	add_bio_to_retry(raid_bi, conf);
-	return 0;
+	return;
 }
 
 static int bio_fits_rdev(struct bio *bi)
diff -puN drivers/scsi/gdth.c~git-block-fixup-1 drivers/scsi/gdth.c
--- a/drivers/scsi/gdth.c~git-block-fixup-1
+++ a/drivers/scsi/gdth.c
@@ -2359,7 +2359,7 @@ static void gdth_copy_internal_data(gdth
 {
     ushort cpcount,i, max_sg = gdth_sg_count(scp);
     ushort cpsum,cpnow;
-    struct scatterlist *sl;
+    struct scatterlist *sl, *sg;
     char *address;
 
     cpcount = min_t(ushort, count, gdth_bufflen(scp));
diff -puN drivers/scsi/megaraid.c~git-block-fixup-1 drivers/scsi/megaraid.c
--- a/drivers/scsi/megaraid.c~git-block-fixup-1
+++ a/drivers/scsi/megaraid.c
@@ -1774,7 +1774,7 @@ mega_build_sglist(adapter_t *adapter, sc
 		return 0;
 	}
 
->>>>>>> 0ec9d8321aa77ae992d25c231884ffaa853ba4cd/drivers/scsi/megaraid.c
+>>>>>>> /drivers/scsi/megaraid.c
 	scsi_for_each_sg(cmd, sg, sgcnt, idx) {
 		if (adapter->has_64bit_addr) {
 			scb->sgl64[idx].address = sg_dma_address(sg);
_