7e1e97ef29
1 OBS-URL: https://build.opensuse.org/request/show/318290 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd?expand=0&rev=44
110 lines
3.5 KiB
Diff
110 lines
3.5 KiB
Diff
From 8bef1ececca3cf22c35f3e9ef95e72c0fd8125a9 Mon Sep 17 00:00:00 2001
|
|
From: Nick Wang <nwang@suse.com>
|
|
Date: Fri, 10 Jul 2015 18:22:25 +0800
|
|
Subject: [Patch v2 06/10] drbd: Wapper for zeroing out device by worker
|
|
|
|
Wapper functions for drbd_device_post_work to start
|
|
zeroing out device. Change state when both node
|
|
finish zeroing.
|
|
|
|
Signed-off-by: Nick Wang <nwang@suse.com>
|
|
CC: Philipp Reisner <philipp.reisner@linbit.com>
|
|
CC: Lars Ellenberg <lars.ellenberg@linbit.com>
|
|
CC: drbd-dev@lists.linbit.com
|
|
CC: linux-kernel@vger.kernel.org
|
|
---
|
|
drbd/drbd_int.h | 2 ++
|
|
drbd/drbd_worker.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 65 insertions(+)
|
|
|
|
diff --git a/drbd/drbd_int.h b/drbd/drbd_int.h
|
|
index f43f957..dd680a9 100644
|
|
--- a/drbd/drbd_int.h
|
|
+++ b/drbd/drbd_int.h
|
|
@@ -1670,6 +1670,8 @@ extern bool drbd_rs_c_min_rate_throttle(struct drbd_device *device);
|
|
extern bool drbd_rs_should_slow_down(struct drbd_device *device, sector_t sector,
|
|
bool throttle_if_app_is_waiting);
|
|
extern int zero_out_local_device(struct drbd_device *device);
|
|
+extern void require_zero_out_local_device(struct drbd_device *device);
|
|
+extern void receive_zero_out_local_device(struct drbd_device *device);
|
|
extern int drbd_submit_peer_request(struct drbd_device *,
|
|
struct drbd_peer_request *, const unsigned,
|
|
const int);
|
|
diff --git a/drbd/drbd_worker.c b/drbd/drbd_worker.c
|
|
index 50564f5..293aa27 100644
|
|
--- a/drbd/drbd_worker.c
|
|
+++ b/drbd/drbd_worker.c
|
|
@@ -1674,6 +1674,69 @@ int zero_out_local_device(struct drbd_device *device)
|
|
device->ldev->known_size, GFP_NOIO, false);
|
|
}
|
|
|
|
+/**
|
|
+ * require_zero_out_local_device()
|
|
+ * @device: DRBD device.
|
|
+ *
|
|
+ * Description:
|
|
+ * Start to zero out local device. Update
|
|
+ * status if peer node (secondary) finished
|
|
+ * zeroing.
|
|
+ *
|
|
+**/
|
|
+void require_zero_out_local_device(struct drbd_device *device)
|
|
+{
|
|
+ int zero_out_err = 0;
|
|
+
|
|
+ zero_out_err = zero_out_local_device(device);
|
|
+
|
|
+ if (zero_out_err) {
|
|
+ drbd_err(device, "Failed to zero out local device\n");
|
|
+ set_bit(ZERO_FAIL, &device->flags);
|
|
+ drbd_chk_io_error(device, 1, DRBD_WRITE_ERROR);
|
|
+ } else {
|
|
+ drbd_info(device, "Finished zero out local device.\n");
|
|
+
|
|
+ if (test_and_clear_bit(ZERO_DONE, &device->flags)) {
|
|
+ spin_lock_irq(&device->resource->req_lock);
|
|
+ _drbd_set_state(_NS2(device, disk, D_UP_TO_DATE,
|
|
+ pdsk, D_UP_TO_DATE), CS_VERBOSE, NULL);
|
|
+ spin_unlock_irq(&device->resource->req_lock);
|
|
+ drbd_send_zero_out_finish(first_peer_device(device));
|
|
+ } else if (test_and_clear_bit(ZERO_FAIL, &device->flags)) {
|
|
+ drbd_info(device, "Peer device has already failed on zero out\n");
|
|
+ } else {
|
|
+ /* waiting for peer device finished */
|
|
+ set_bit(ZERO_DONE, &device->flags);
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+/**
|
|
+ * receive_zero_out_local_device()
|
|
+ * @device: DRBD device.
|
|
+ *
|
|
+ * Description:
|
|
+ * Start to zero out local device.
|
|
+ * Notify peer node the zeroing result.
|
|
+ *
|
|
+**/
|
|
+void receive_zero_out_local_device(struct drbd_device *device)
|
|
+{
|
|
+ int zero_out_err = 0;
|
|
+ struct drbd_peer_device *const peer_device = first_peer_device(device);
|
|
+
|
|
+ zero_out_err = zero_out_local_device(device);
|
|
+ if (zero_out_err) {
|
|
+ drbd_err(device, "Failed to zero out local device\n");
|
|
+ drbd_send_zero_out_fail(peer_device);
|
|
+ drbd_chk_io_error(device, 1, DRBD_WRITE_ERROR);
|
|
+ } else {
|
|
+ drbd_info(device, "Finished zero out local device.\n");
|
|
+ drbd_send_zero_out_ok(peer_device);
|
|
+ }
|
|
+}
|
|
+
|
|
void start_resync_timer_fn(unsigned long data)
|
|
{
|
|
struct drbd_device *device = (struct drbd_device *) data;
|
|
--
|
|
1.8.4.5
|
|
|