iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drbd: __drbd_make_request() is now void

Browse Source 
The previous commit causes __drbd_make_request() to always return 0.
Change it to void.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Lars Ellenberg 2012-01-24 16:49:58 +01:00 committed by Philipp Reisner
parent 5da9c83644
commit 5df69ece6e
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/drbd/drbd_int.h
View File

@ -1403,7 +1403,7 @@ extern void conn_free_crypto(struct drbd_tconn *tconn);
extern int proc_details; extern int proc_details;
/* drbd_req */ /* drbd_req */
extern int __drbd_make_request(struct drbd_conf *, struct bio *, unsigned long); extern void __drbd_make_request(struct drbd_conf *, struct bio *, unsigned long);
extern int drbd_make_request(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_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 drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec);

5
drivers/block/drbd/drbd_main.c
View File

@ -2236,9 +2236,8 @@ static void do_retry(struct work_struct *ws)
/* We are not just doing generic_make_request(), /* We are not just doing generic_make_request(),
* as we want to keep the start_time information. */ * as we want to keep the start_time information. */
do { inc_ap_bio(mdev);
inc_ap_bio(mdev); __drbd_make_request(mdev, bio, start_time);
} while(__drbd_make_request(mdev, bio, start_time));
} }
} }

13
drivers/block/drbd/drbd_req.c
View File

@ -945,7 +945,7 @@ drbd_submit_req_private_bio(struct drbd_request *req)
bio_endio(bio, -EIO); bio_endio(bio, -EIO);
} }
int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long start_time) void __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long start_time)
{ {
const int rw = bio_rw(bio); const int rw = bio_rw(bio);
struct bio_and_error m = { NULL, }; struct bio_and_error m = { NULL, };
@ -960,7 +960,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s
* if user cannot handle io errors, that's not our business. */ * if user cannot handle io errors, that's not our business. */
dev_err(DEV, "could not kmalloc() req\n"); dev_err(DEV, "could not kmalloc() req\n");
bio_endio(bio, -ENOMEM); bio_endio(bio, -ENOMEM);
return 0; return;
} }
req->start_time = start_time; req->start_time = start_time;
@ -1039,7 +1039,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s
drbd_submit_req_private_bio(req); drbd_submit_req_private_bio(req);
/* once we have submitted, we must no longer look at req, /* once we have submitted, we must no longer look at req,
* it may already be destroyed. */ * it may already be destroyed. */
return 0; return;
} else if (no_remote) { } else if (no_remote) {
nodata: nodata:
if (__ratelimit(&drbd_ratelimit_state)) if (__ratelimit(&drbd_ratelimit_state))
@ -1054,7 +1054,7 @@ out:
if (m.bio) if (m.bio)
complete_master_bio(mdev, &m); complete_master_bio(mdev, &m);
return 0; return;
} }
int drbd_make_request(struct request_queue *q, struct bio *bio) int drbd_make_request(struct request_queue *q, struct bio *bio)
@ -1070,9 +1070,8 @@ int drbd_make_request(struct request_queue *q, struct bio *bio)
D_ASSERT(bio->bi_size > 0); D_ASSERT(bio->bi_size > 0);
D_ASSERT(IS_ALIGNED(bio->bi_size, 512)); D_ASSERT(IS_ALIGNED(bio->bi_size, 512));
do { inc_ap_bio(mdev);
inc_ap_bio(mdev); __drbd_make_request(mdev, bio, start_time);
} while (__drbd_make_request(mdev, bio, start_time));
return 0; return 0;
} }