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>
This commit is contained in:
Родитель
96756784a6
Коммит
2f58dcfc85
|
@ -1479,7 +1479,7 @@ extern void drbd_free_mdev(struct drbd_conf *mdev);
|
|||
extern int proc_details;
|
||||
|
||||
/* drbd_req */
|
||||
extern int drbd_make_request_26(struct request_queue *q, struct bio *bio);
|
||||
extern int drbd_make_request(struct request_queue *q, struct bio *bio);
|
||||
extern int drbd_read_remote(struct drbd_conf *mdev, struct drbd_request *req);
|
||||
extern int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec);
|
||||
extern int is_valid_ar_handle(struct drbd_request *, sector_t);
|
||||
|
|
|
@ -3284,7 +3284,7 @@ struct drbd_conf *drbd_new_device(unsigned int minor)
|
|||
q->backing_dev_info.congested_fn = drbd_congested;
|
||||
q->backing_dev_info.congested_data = mdev;
|
||||
|
||||
blk_queue_make_request(q, drbd_make_request_26);
|
||||
blk_queue_make_request(q, drbd_make_request);
|
||||
blk_queue_max_hw_sectors(q, DRBD_MAX_BIO_SIZE >> 9);
|
||||
blk_queue_bounce_limit(q, BLK_BOUNCE_ANY);
|
||||
blk_queue_merge_bvec(q, drbd_merge_bvec);
|
||||
|
|
|
@ -884,7 +884,7 @@ allocate_barrier:
|
|||
if (is_susp(mdev->state)) {
|
||||
/* If we got suspended, use the retry mechanism of
|
||||
generic_make_request() to restart processing of this
|
||||
bio. In the next call to drbd_make_request_26
|
||||
bio. In the next call to drbd_make_request
|
||||
we sleep in inc_ap_bio() */
|
||||
ret = 1;
|
||||
spin_unlock_irq(&mdev->req_lock);
|
||||
|
@ -1089,7 +1089,7 @@ static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int drbd_make_request_26(struct request_queue *q, struct bio *bio)
|
||||
int drbd_make_request(struct request_queue *q, struct bio *bio)
|
||||
{
|
||||
unsigned int s_enr, e_enr;
|
||||
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)
|
|||
* As long as the BIO is empty we have to allow at least one bvec,
|
||||
* regardless of size and offset. so the resulting bio may still
|
||||
* cross extent boundaries. those are dealt with (bio_split) in
|
||||
* drbd_make_request_26.
|
||||
* drbd_make_request.
|
||||
*/
|
||||
int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче