Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753790AbbGUCng (ORCPT <rfc822;w@1wt.eu>);
	Mon, 20 Jul 2015 22:43:36 -0400
Received: from victor.provo.novell.com ([137.65.250.26]:38756 "EHLO
	prv3-mh.provo.novell.com" rhost-flags-OK-OK-OK-FAIL)
	by vger.kernel.org with ESMTP id S1751052AbbGUCnf (ORCPT
	<rfc822;groupwise-linux-kernel@vger.kernel.org:0:0>);
	Mon, 20 Jul 2015 22:43:35 -0400
From: Nick Wang <nwang@suse.com>
To: nwang@suse.com
Cc: Philipp Reisner <philipp.reisner@linbit.com>,
        Lars Ellenberg <lars.ellenberg@linbit.com>, drbd-dev@lists.linbit.com,
        linux-kernel@vger.kernel.org
Subject: [PATCH] drbdsetup: Allow zeroing out devices locally to instead of initial full sync.
Date: Tue, 21 Jul 2015 10:43:16 +0800
Message-Id: <1437446596-19004-1-git-send-email-nwang@suse.com>
X-Mailer: git-send-email 1.8.4.5
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2376
Lines: 67

Full sync for drbd initial usually take a long time,
allow "--zap-devices" on "new-current-uuid" to zero
out device on both side.

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
---
 documentation/v84/drbdsetup.xml | 9 +++++++++
 user/v84/config_flags.c         | 1 +
 user/v84/linux/drbd_genl.h      | 1 +
 3 files changed, 11 insertions(+)

diff --git a/documentation/v84/drbdsetup.xml b/documentation/v84/drbdsetup.xml
index d4c4e87..a44b733 100644
--- a/documentation/v84/drbdsetup.xml
+++ b/documentation/v84/drbdsetup.xml
@@ -1705,6 +1705,15 @@
               <para>Clears the sync bitmap in addition to generating a new current UUID.</para>
             </listitem>
           </varlistentry>
+
+          <varlistentry>
+            <term><option>--zap-devices</option></term>
+
+            <listitem>
+              <para>Start to zeroing out the device on both side in addition to generating
+              a new current UUID .</para>
+            </listitem>
+          </varlistentry>
         </variablelist></para>
 
       <para>This can be used to skip the initial sync, if you want to start from scratch. This
diff --git a/user/v84/config_flags.c b/user/v84/config_flags.c
index 3b0303f..8712a11 100644
--- a/user/v84/config_flags.c
+++ b/user/v84/config_flags.c
@@ -1019,6 +1019,7 @@ struct context_def new_current_uuid_cmd_ctx = {
 	NLA_POLICY(new_c_uuid_parms),
 	.fields = {
 		{ "clear-bitmap", FLAG(clear_bm) },
+		{ "zap-devices", FLAG(zap_devices) },
 		{ } },
 };
 
diff --git a/user/v84/linux/drbd_genl.h b/user/v84/linux/drbd_genl.h
index 8ddedd1..0b850d3 100644
--- a/user/v84/linux/drbd_genl.h
+++ b/user/v84/linux/drbd_genl.h
@@ -238,6 +238,7 @@ GENL_struct(DRBD_NLA_START_OV_PARMS, 9, start_ov_parms,
 
 GENL_struct(DRBD_NLA_NEW_C_UUID_PARMS, 10, new_c_uuid_parms,
 	__flg_field(1, DRBD_GENLA_F_MANDATORY, clear_bm)
+	__flg_field(2, DRBD_GENLA_F_MANDATORY, zap_devices)
 )
 
 GENL_struct(DRBD_NLA_TIMEOUT_PARMS, 11, timeout_parms,
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/