block: fix compile errors

Fix various compile errors, e.g. getting rid of BIOVEC_PHYS_MERGEABLE, using bvec instead of sg, set bio as the 2nd arg of __blk_segment_map_sg(), etc.
dongsupark · Jan 12, 2015 · 799411d · 799411d
1 parent 7f841d9
commit 799411d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/block/bio.c b/block/bio.c
@@ -790,7 +790,7 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page
 	}
 
 	/* If we may be able to merge these biovecs, force a recount */
-	if (bio->bi_vcnt > 1 && (BIOVEC_PHYS_MERGEABLE(bvec-1, bvec)))
+	if (bio->bi_vcnt > 1)
 		bio->bi_flags &= ~(1 << BIO_SEG_VALID);
 
  done:

diff --git a/block/blk-merge.c b/block/blk-merge.c
@@ -289,7 +289,7 @@ static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio,
 			     struct scatterlist *sglist,
 			     struct scatterlist **sg)
 {
-	struct scatterlist *sg = NULL;
+	struct bio_vec bvec;
 	unsigned nsegs;
 
 	if (bio->bi_rw & REQ_DISCARD) {
@@ -318,7 +318,7 @@ static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio,
 	/*
 	 * for each bio in rq
 	 */
-	nsegs = __blk_segment_map_sg(q, rq->bio, sglist, &sg);
+	nsegs = __blk_segment_map_sg(q, bio, sglist, sg);
 
 	return nsegs;
 }