3 files changed, 3 insertions, 4 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 8ca8925520ad..f6cfc45b862a 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2734,7 +2734,7 @@ static int _drbd_send_bio(struct drbd_conf *mdev, struct bio *bio)
         struct bio_vec *bvec;
         int i;
         /* hint all but last page with MSG_MORE */
-        __bio_for_each_segment(bvec, bio, i, 0) {
+        bio_for_each_segment(bvec, bio, i) {
                 if (!_drbd_no_send_page(mdev, bvec->bv_page,
                                      bvec->bv_offset, bvec->bv_len,
                                      i == bio->bi_vcnt -1 ? 0 : MSG_MORE))
@@ -2748,7 +2748,7 @@ static int _drbd_send_zc_bio(struct drbd_conf *mdev, struct bio *bio)
         struct bio_vec *bvec;
         int i;
         /* hint all but last page with MSG_MORE */
-        __bio_for_each_segment(bvec, bio, i, 0) {
+        bio_for_each_segment(bvec, bio, i) {
                 if (!_drbd_send_page(mdev, bvec->bv_page,
                                      bvec->bv_offset, bvec->bv_len,
                                      i == bio->bi_vcnt -1 ? 0 : MSG_MORE))
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 4fc7f98d9856..de319ba54241 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1106,7 +1106,6 @@ void drbd_make_request(struct request_queue *q, struct bio *bio)
          */
         D_ASSERT(bio->bi_size > 0);
         D_ASSERT((bio->bi_size & 0x1ff) == 0);
-        D_ASSERT(bio->bi_idx == 0);
 
         /* to make some things easier, force alignment of requests within the
          * granularity of our hash tables */
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 56fd69e38298..14aa4a2d4dc4 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -308,7 +308,7 @@ void drbd_csum_bio(struct drbd_conf *mdev, struct crypto_hash *tfm, struct bio *
         sg_init_table(&sg, 1);
         crypto_hash_init(&desc);
 
-        __bio_for_each_segment(bvec, bio, i, 0) {
+        bio_for_each_segment(bvec, bio, i) {
                 sg_set_page(&sg, bvec->bv_page, bvec->bv_len, bvec->bv_offset);
                 crypto_hash_update(&desc, &sg, sg.length);
         }