diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2010-12-13 11:48:19 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 05:36:11 -0500 |
commit | 2f58dcfc85b6800efd938f755e6c5f9979f4aa5c (patch) | |
tree | f8d9fff58a1ae7640b26e8ec323aa9a9e4f818b0 /drivers/block/drbd/drbd_req.c | |
parent | 96756784a6250c7d9878671ef3386b93b0c576d4 (diff) |
drbd: Rename drbd_make_request_26 to drbd_make_request
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_req.c')
-rw-r--r-- | drivers/block/drbd/drbd_req.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | { |