Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea5442af authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: advance progress step marks for online-verify 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent c6ea14df

drivers/block/drbd/drbd_int.h

+1 −0
Original line number Diff line number Diff line
@@ -1619,6 +1619,7 @@ extern int drbd_rs_del_all(struct drbd_conf *mdev); 
extern void drbd_rs_failed_io(struct drbd_conf *mdev,

		sector_t sector, int size);

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,

		int size, const char *file, const unsigned int line);

#define drbd_set_in_sync(mdev, sector, size) \

drivers/block/drbd/drbd_receiver.c

+7 −1
Original line number Diff line number Diff line
@@ -4340,7 +4340,13 @@ static int got_OVResult(struct drbd_conf *mdev, struct p_header80 *h) 
	drbd_rs_complete_io(mdev, sector);

	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);

		if (w) {

			w->cb = w_ov_finished;

drivers/block/drbd/drbd_worker.c

+7 −1
Original line number Diff line number Diff line
@@ -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);



	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);

		drbd_resync_finished(mdev);

	}