diff options
| author | Lars Ellenberg | 2010-11-09 14:15:24 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-03-10 11:19:06 +0100 |
| commit | 5f9915bbb8e0975ce99f893c29b8e89100b33399 (patch) | |
| tree | 70606e132030ad46414d9e2d658b748cdaa70ae9 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: fix potential wrap of 32bit oos:%lu display in /proc/drbd (diff) | |
| download | kernel-qcow2-linux-5f9915bbb8e0975ce99f893c29b8e89100b33399.tar.gz kernel-qcow2-linux-5f9915bbb8e0975ce99f893c29b8e89100b33399.tar.xz kernel-qcow2-linux-5f9915bbb8e0975ce99f893c29b8e89100b33399.zip | |
drbd: further converge progress display of resync and online-verify
Show progressbar and ETA always, with proc_details >= 1 also show the
current sector position for both resync and online-verify on both nodes.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 1c56af03c38b..d0e19a242af4 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1974,6 +1974,8 @@ static int receive_DataRequest(struct drbd_conf *mdev, enum drbd_packets cmd, un case P_RS_DATA_REQUEST: e->w.cb = w_e_end_rsdata_req; fault_type = DRBD_FAULT_RS_RD; + /* used in the sector offset progress display */ + mdev->bm_resync_fo = BM_SECT_TO_BIT(sector); break; case P_OV_REPLY: @@ -1995,6 +1997,8 @@ static int receive_DataRequest(struct drbd_conf *mdev, enum drbd_packets cmd, un if (cmd == P_CSUM_RS_REQUEST) { D_ASSERT(mdev->agreed_pro_version >= 89); e->w.cb = w_e_end_csum_rs_req; + /* used in the sector offset progress display */ + mdev->bm_resync_fo = BM_SECT_TO_BIT(sector); } else if (cmd == P_OV_REPLY) { /* track progress, we may need to throttle */ atomic_add(size >> 9, &mdev->rs_sect_in); |