diff options
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 2 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 2 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 3268d201025b..7514cf7a958c 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
| @@ -1479,7 +1479,7 @@ extern void drbd_free_mdev(struct drbd_conf *mdev); | |||
| 1479 | extern int proc_details; | 1479 | extern int proc_details; |
| 1480 | 1480 | ||
| 1481 | /* drbd_req */ | 1481 | /* drbd_req */ |
| 1482 | extern int drbd_make_request_26(struct request_queue *q, struct bio *bio); | 1482 | extern int drbd_make_request(struct request_queue *q, struct bio *bio); |
| 1483 | extern int drbd_read_remote(struct drbd_conf *mdev, struct drbd_request *req); | 1483 | extern int drbd_read_remote(struct drbd_conf *mdev, struct drbd_request *req); |
| 1484 | extern int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec); | 1484 | extern int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec); |
| 1485 | extern int is_valid_ar_handle(struct drbd_request *, sector_t); | 1485 | extern int is_valid_ar_handle(struct drbd_request *, sector_t); |
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 50b6841d135b..7d60527c3b5a 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
| @@ -3284,7 +3284,7 @@ struct drbd_conf *drbd_new_device(unsigned int minor) | |||
| 3284 | q->backing_dev_info.congested_fn = drbd_congested; | 3284 | q->backing_dev_info.congested_fn = drbd_congested; |
| 3285 | q->backing_dev_info.congested_data = mdev; | 3285 | q->backing_dev_info.congested_data = mdev; |
| 3286 | 3286 | ||
| 3287 | blk_queue_make_request(q, drbd_make_request_26); | 3287 | blk_queue_make_request(q, drbd_make_request); |
| 3288 | blk_queue_max_hw_sectors(q, DRBD_MAX_BIO_SIZE >> 9); | 3288 | blk_queue_max_hw_sectors(q, DRBD_MAX_BIO_SIZE >> 9); |
| 3289 | blk_queue_bounce_limit(q, BLK_BOUNCE_ANY); | 3289 | blk_queue_bounce_limit(q, BLK_BOUNCE_ANY); |
| 3290 | blk_queue_merge_bvec(q, drbd_merge_bvec); | 3290 | blk_queue_merge_bvec(q, drbd_merge_bvec); |
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index de5fe70f2b42..079213d93490 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c | |||
| @@ -884,7 +884,7 @@ allocate_barrier: | |||
| 884 | if (is_susp(mdev->state)) { | 884 | if (is_susp(mdev->state)) { |
| 885 | /* If we got suspended, use the retry mechanism of | 885 | /* If we got suspended, use the retry mechanism of |
| 886 | generic_make_request() to restart processing of this | 886 | generic_make_request() to restart processing of this |
| 887 | bio. In the next call to drbd_make_request_26 | 887 | bio. In the next call to drbd_make_request |
| 888 | we sleep in inc_ap_bio() */ | 888 | we sleep in inc_ap_bio() */ |
| 889 | ret = 1; | 889 | ret = 1; |
| 890 | spin_unlock_irq(&mdev->req_lock); | 890 | spin_unlock_irq(&mdev->req_lock); |
| @@ -1089,7 +1089,7 @@ static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write) | |||
| 1089 | return 0; | 1089 | return 0; |
| 1090 | } | 1090 | } |
| 1091 | 1091 | ||
| 1092 | int drbd_make_request_26(struct request_queue *q, struct bio *bio) | 1092 | int drbd_make_request(struct request_queue *q, struct bio *bio) |
| 1093 | { | 1093 | { |
| 1094 | unsigned int s_enr, e_enr; | 1094 | unsigned int s_enr, e_enr; |
| 1095 | struct drbd_conf *mdev = (struct drbd_conf *) q->queuedata; | 1095 | struct drbd_conf *mdev = (struct drbd_conf *) q->queuedata; |
| @@ -1182,7 +1182,7 @@ int drbd_make_request_26(struct request_queue *q, struct bio *bio) | |||
| 1182 | * As long as the BIO is empty we have to allow at least one bvec, | 1182 | * As long as the BIO is empty we have to allow at least one bvec, |
| 1183 | * regardless of size and offset. so the resulting bio may still | 1183 | * regardless of size and offset. so the resulting bio may still |
| 1184 | * cross extent boundaries. those are dealt with (bio_split) in | 1184 | * cross extent boundaries. those are dealt with (bio_split) in |
| 1185 | * drbd_make_request_26. | 1185 | * drbd_make_request. |
| 1186 | */ | 1186 | */ |
| 1187 | int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec) | 1187 | int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec) |
| 1188 | { | 1188 | { |
