korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-27 04:54:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

drbd: restart loop in drbd_make_request() [prepare for Linux-3.2]

Browse Source 
With Linux-3.2 generic_make_request() will no longer loop over
the request function until it finally returns 0. Move this
loop into our drbd_make_request() function.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2011-12-20 11:49:58 +01:00
parent 7da358625c
commit 69b6a3b159
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -929,8 +929,8 @@ allocate_barrier:
}
if (drbd_suspended(mdev)) {
/* If we got suspended, use the retry mechanism of
generic_make_request() to restart processing of this
/* If we got suspended, use the retry mechanism in
drbd_make_request() to restart processing of this
bio. In the next call to drbd_make_request
we sleep in inc_ap_bio() */
ret = 1;
@ -1110,8 +1110,11 @@ int drbd_make_request(struct request_queue *q, struct bio *bio)
D_ASSERT(bio->bi_size > 0);
D_ASSERT(IS_ALIGNED(bio->bi_size, 512));
inc_ap_bio(mdev);
return __drbd_make_request(mdev, bio, start_time);
do {
inc_ap_bio(mdev);
} while (__drbd_make_request(mdev, bio, start_time));
return 0;
}
/* This is called by bio_add_page().