aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2010-12-18 17:00:59 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 11:43:40 +0100
commit06d33e968d2c58143a7aaafa8963cf6a58099467 (patch)
tree4380d4060178a44ea0e4d56a47d1fff1a43e7b86 /drivers/block
parent418e0a927d520f9c8e875ea75abee35d93a0f1b3 (diff)
downloadkernel_samsung_tuna-06d33e968d2c58143a7aaafa8963cf6a58099467.zip
kernel_samsung_tuna-06d33e968d2c58143a7aaafa8963cf6a58099467.tar.gz
kernel_samsung_tuna-06d33e968d2c58143a7aaafa8963cf6a58099467.tar.bz2
drbd: improve on bitmap write out timing
Even though we now track the need for bitmap writeout per bitmap page, there is no need to trigger the writeout while a resync is going on. Once the resync is finished (or aborted), we trigger bitmap writeout anyways. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index f529c25..755297a 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1439,7 +1439,11 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
put_ldev(mdev);
}
- if (os.role == R_PRIMARY && ns.role == R_SECONDARY && get_ldev(mdev)) {
+ /* Write out all changed bits on demote.
+ * Though, no need to da that just yet
+ * if there is a resync going on still */
+ if (os.role == R_PRIMARY && ns.role == R_SECONDARY &&
+ mdev->state.conn <= C_CONNECTED && get_ldev(mdev)) {
drbd_bitmap_io_from_worker(mdev, &drbd_bm_write, "demote");
put_ldev(mdev);
}
@@ -1559,7 +1563,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
if (os.disk < D_UP_TO_DATE && os.conn >= C_SYNC_SOURCE && ns.conn == C_CONNECTED)
drbd_send_state(mdev);
- if (os.conn > C_CONNECTED && ns.conn == C_CONNECTED)
+ if (os.conn > C_CONNECTED && ns.conn <= C_CONNECTED)
drbd_queue_bitmap_io(mdev, &drbd_bm_write, NULL, "write from resync_finished");
/* free tl_hash if we Got thawed and are C_STANDALONE */