UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drbd: advance progress step marks for online-verify 

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 2010-11-05 09:48:01 +01:00 committed by Philipp Reisner
parent c6ea14dfa3
commit ea5442aff6
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1619,6 +1619,7 @@ extern int drbd_rs_del_all(struct drbd_conf *mdev);
extern void drbd_rs_failed_io(struct drbd_conf *mdev, extern void drbd_rs_failed_io(struct drbd_conf *mdev,
sector_t sector, int size); sector_t sector, int size);
extern int drbd_al_read_log(struct drbd_conf *mdev, struct drbd_backing_dev *); extern int drbd_al_read_log(struct drbd_conf *mdev, struct drbd_backing_dev *);
extern void drbd_advance_rs_marks(struct drbd_conf *mdev, unsigned long still_to_go);
extern void __drbd_set_in_sync(struct drbd_conf *mdev, sector_t sector, extern void __drbd_set_in_sync(struct drbd_conf *mdev, sector_t sector,
int size, const char *file, const unsigned int line); int size, const char *file, const unsigned int line);
#define drbd_set_in_sync(mdev, sector, size) \ #define drbd_set_in_sync(mdev, sector, size) \

8
drivers/block/drbd/drbd_receiver.c
View File

@ -4340,7 +4340,13 @@ static int got_OVResult(struct drbd_conf *mdev, struct p_header80 *h)
drbd_rs_complete_io(mdev, sector); drbd_rs_complete_io(mdev, sector);
dec_rs_pending(mdev); dec_rs_pending(mdev);
if (--mdev->ov_left == 0) { --mdev->ov_left;
/* let's advance progress step marks only for every other megabyte */
if ((mdev->ov_left & 0x200) == 0x200)
drbd_advance_rs_marks(mdev, mdev->ov_left);
if (mdev->ov_left == 0) {
w = kmalloc(sizeof(*w), GFP_NOIO); w = kmalloc(sizeof(*w), GFP_NOIO);
if (w) { if (w) {
w->cb = w_ov_finished; w->cb = w_ov_finished;

8
drivers/block/drbd/drbd_worker.c
View File

@ -1185,7 +1185,13 @@ int w_e_end_ov_reply(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
drbd_free_ee(mdev, e); drbd_free_ee(mdev, e);
if (--mdev->ov_left == 0) { --mdev->ov_left;
/* let's advance progress step marks only for every other megabyte */
if ((mdev->ov_left & 0x200) == 0x200)
drbd_advance_rs_marks(mdev, mdev->ov_left);
if (mdev->ov_left == 0) {
ov_oos_print(mdev); ov_oos_print(mdev);
drbd_resync_finished(mdev); drbd_resync_finished(mdev);
} }