Stop exporting blk_rq_bio_prep

blk_rq_bio_prep is exported for use in exactly
one place.  That place can benefit from using
the new blk_rq_append_bio instead.
So
  - change dm-emc to call blk_rq_append_bio
  - stop exporting blk_rq_bio_prep, and
  - initialise rq_disk in blk_rq_bio_prep,
       as dm-emc needs it.

Signed-off-by: Neil Brown <neilb@suse.de>

diff .prev/block/ll_rw_blk.c ./block/ll_rw_blk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/md/dm-emc.c b/drivers/md/dm-emc.c
index 265c467854da..71cc858b7860 100644
--- a/drivers/md/dm-emc.c
+++ b/drivers/md/dm-emc.c
@@ -109,15 +109,7 @@ static struct request *get_failover_req(struct emc_handler *h,
                 return NULL;
         }
 
-        rq->bio = rq->biotail = bio;
-        blk_rq_bio_prep(q, rq, bio);
-
-        rq->rq_disk = bdev->bd_contains->bd_disk;
-
-        /* bio backed don't set data */
-        rq->buffer = rq->data = NULL;
-        /* rq data_len used for pc cmd's request_bufflen */
-        rq->data_len = bio->bi_size;
+        blk_rq_append_bio(q, rq, bio);
 
         rq->sense = h->sense;
         memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);