[DRBD-cvs] svn commit by phil - r2356 - in trunk: documentation
drbd drbd/linux user - Removed the long unused skip-sync
option, and the not h
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Thu Aug 10 13:32:08 CEST 2006
Author: phil
Date: 2006-08-10 13:31:57 +0200 (Thu, 10 Aug 2006)
New Revision: 2356
Modified:
trunk/documentation/drbdsetup.sgml
trunk/drbd/drbd_fs.c
trunk/drbd/drbd_int.h
trunk/drbd/drbd_main.c
trunk/drbd/drbd_receiver.c
trunk/drbd/drbd_sizeof_sanity_check.c
trunk/drbd/drbd_strings.c
trunk/drbd/linux/drbd.h
trunk/drbd/linux/drbd_config.h
trunk/user/drbdsetup.c
Log:
Removed the long unused skip-sync option, and the not here
implemented use-csyms option.
Modified: trunk/documentation/drbdsetup.sgml
===================================================================
--- trunk/documentation/drbdsetup.sgml 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/documentation/drbdsetup.sgml 2006-08-10 11:31:57 UTC (rev 2356)
@@ -55,7 +55,6 @@
<command>drbdsetup</command>
<arg choice="req"><replaceable>device</replaceable></arg>
<arg choice="req">syncer</arg>
- <arg>-k</arg>
<arg>-a<arg choice="req"><replaceable>dev_minor</replaceable></arg></arg>
<arg>-r<arg choice="req"><replaceable>rate</replaceable></arg></arg>
<arg>-e<arg choice="req"><replaceable>extents</replaceable></arg></arg>
@@ -587,15 +586,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-k</option>,
- <option>--skip-sync </option></term>
- <listitem><para>
- This option suppresses the automatic start of the resynchronization
- process, which
- is triggered as soon as two DRBD devices are connected.
- </para></listitem>
- </varlistentry>
- <varlistentry>
<term><option>-a</option>,
<option>--after <replaceable>minor</replaceable></option></term>
<listitem>
Modified: trunk/drbd/drbd_fs.c
===================================================================
--- trunk/drbd/drbd_fs.c 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/drbd/drbd_fs.c 2006-08-10 11:31:57 UTC (rev 2356)
@@ -1034,9 +1034,7 @@
}
}
- sc.use_csums = 0; // TODO, NYI
ERR_IF (sc.rate < 1) sc.rate = 1;
- ERR_IF (sc.skip & ~1) sc.skip = !!sc.skip;
ERR_IF (sc.al_extents < 7) sc.al_extents = 127; // arbitrary minimum
#define AL_MAX ((MD_AL_MAX_SIZE-1) * AL_EXTENTS_PT)
if(sc.al_extents > AL_MAX) {
@@ -1046,8 +1044,6 @@
#undef AL_MAX
mdev->sync_conf.rate = sc.rate;
- mdev->sync_conf.use_csums = sc.use_csums;
- mdev->sync_conf.skip = sc.skip;
mdev->sync_conf.al_extents = sc.al_extents;
err = drbd_check_al_size(mdev);
Modified: trunk/drbd/drbd_int.h
===================================================================
--- trunk/drbd/drbd_int.h 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/drbd/drbd_int.h 2006-08-10 11:31:57 UTC (rev 2356)
@@ -483,8 +483,6 @@
typedef struct {
Drbd_Header head;
u32 rate;
- u32 use_csums;
- u32 skip;
u32 after;
} __attribute((packed)) Drbd_SyncParam_Packet;
Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/drbd/drbd_main.c 2006-08-10 11:31:57 UTC (rev 2356)
@@ -724,7 +724,6 @@
rv=SS_SyncingDiskless;
else if( (ns.conn == Connected ||
- ns.conn == SkippedSyncS ||
ns.conn == WFBitMapS ||
ns.conn == SyncSource ||
ns.conn == PausedSyncS) &&
@@ -782,13 +781,11 @@
if( ns.conn >= Connected &&
( ns.disk == Consistent || ns.disk == Outdated ) ) {
switch(ns.conn) {
- case SkippedSyncT:
case WFBitMapT:
case PausedSyncT:
ns.disk = Outdated;
break;
case Connected:
- case SkippedSyncS:
case WFBitMapS:
case SyncSource:
case PausedSyncS:
@@ -808,13 +805,11 @@
( ns.pdsk == Consistent || ns.pdsk == Outdated ) ) {
switch(ns.conn) {
case Connected:
- case SkippedSyncT:
case WFBitMapT:
case PausedSyncT:
case SyncTarget:
ns.pdsk = UpToDate;
break;
- case SkippedSyncS:
case WFBitMapS:
case PausedSyncS:
ns.pdsk = Outdated;
@@ -1313,8 +1308,6 @@
Drbd_SyncParam_Packet p;
p.rate = cpu_to_be32(sc->rate);
- p.use_csums = cpu_to_be32(sc->use_csums);
- p.skip = cpu_to_be32(sc->skip);
p.after = cpu_to_be32(sc->after);
return drbd_send_cmd(mdev,USE_DATA_SOCKET,SyncParam,(Drbd_Header*)&p,sizeof(p));
Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/drbd/drbd_receiver.c 2006-08-10 11:31:57 UTC (rev 2356)
@@ -1846,8 +1846,6 @@
// XXX harmless race with ioctl ...
mdev->sync_conf.rate = be32_to_cpu(p->rate);
- mdev->sync_conf.use_csums = be32_to_cpu(p->use_csums);
- mdev->sync_conf.skip = be32_to_cpu(p->skip);
drbd_alter_sa(mdev, be32_to_cpu(p->after));
return ok;
Modified: trunk/drbd/drbd_sizeof_sanity_check.c
===================================================================
--- trunk/drbd/drbd_sizeof_sanity_check.c 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/drbd/drbd_sizeof_sanity_check.c 2006-08-10 11:31:57 UTC (rev 2356)
@@ -9,11 +9,11 @@
SZO(disk_config, 32)
SZO(net_config, 456)
-SZO(syncer_config, 24)
+SZO(syncer_config, 16)
SZO(ioctl_disk_config, 40)
SZO(ioctl_net_config, 464)
-SZO(ioctl_syncer_config, 32)
+SZO(ioctl_syncer_config, 24)
SZO(ioctl_wait, 16)
-SZO(ioctl_get_config, 584)
+SZO(ioctl_get_config, 576)
SZO(ioctl_get_uuids, 48)
Modified: trunk/drbd/drbd_strings.c
===================================================================
--- trunk/drbd/drbd_strings.c 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/drbd/drbd_strings.c 2006-08-10 11:31:57 UTC (rev 2356)
@@ -32,8 +32,6 @@
[WFReportParams] = "WFReportParams",
[TearDown] = "TearDown",
[Connected] = "Connected",
- [SkippedSyncS] = "SkippedSyncS",
- [SkippedSyncT] = "SkippedSyncT",
[StartingSyncS] = "StartingSyncS",
[StartingSyncT] = "StartingSyncT",
[WFBitMapS] = "WFBitMapS",
Modified: trunk/drbd/linux/drbd.h
===================================================================
--- trunk/drbd/linux/drbd.h 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/drbd/linux/drbd.h 2006-08-10 11:31:57 UTC (rev 2356)
@@ -128,8 +128,6 @@
struct syncer_config {
int rate; /* KB/sec */
- int use_csums; /* use checksum based syncing*/
- int skip;
int after;
int al_extents;
const int _pad;
@@ -221,8 +219,6 @@
WFReportParams, // we have a socket
TearDown,
Connected, // we have introduced each other
- SkippedSyncS, // we should have synced, but user said no
- SkippedSyncT,
StartingSyncS, // starting full sync by IOCTL.
StartingSyncT, // stariing full sync by IOCTL.
WFBitMapS,
Modified: trunk/drbd/linux/drbd_config.h
===================================================================
--- trunk/drbd/linux/drbd_config.h 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/drbd/linux/drbd_config.h 2006-08-10 11:31:57 UTC (rev 2356)
@@ -23,7 +23,7 @@
extern const char * drbd_buildtag(void);
#define REL_VERSION "8.0pre4"
-#define API_VERSION 83
+#define API_VERSION 84
#define PRO_VERSION 82
// undef if you need the workaround in drbd_receiver
Modified: trunk/user/drbdsetup.c
===================================================================
--- trunk/user/drbdsetup.c 2006-08-10 11:13:53 UTC (rev 2355)
+++ trunk/user/drbdsetup.c 2006-08-10 11:31:57 UTC (rev 2356)
@@ -957,14 +957,10 @@
cn.config.rate = current_cn.sconf.rate;
cn.config.after = current_cn.sconf.after;
cn.config.al_extents = current_cn.sconf.al_extents;
- cn.config.use_csums = 0; //current_cn.sconf.use_csums;
- cn.config.skip = 0; //current_cn.sconf.skip;
*/
cn.config.rate = DEF_SYNC_RATE;
cn.config.after = DEF_SYNC_AFTER;
cn.config.al_extents = DEF_SYNC_AL_EXTENTS;
- cn.config.use_csums = 0; //current_cn.sconf.use_csums;
- cn.config.skip = 0; //current_cn.sconf.skip;
if(argc > 0)
@@ -978,12 +974,6 @@
if(c == -1) break;
switch(c)
{
- case 'c':
- cn.config.use_csums=1;
- break;
- case 'k':
- cn.config.skip=1;
- break;
case 'r':
cn.config.rate=m_strtoll_range(optarg,'K', "rate",
DRBD_RATE_MIN, DRBD_RATE_MAX);
@@ -1406,8 +1396,6 @@
SHOW_IU("rate\t","K","(K)Byte/second", cn.sconf.rate, DEF_SYNC_RATE);
SHOW_I("after\t","minor", cn.sconf.after, DEF_SYNC_AFTER);
SHOW_I("al-extents","4MByte", cn.sconf.al_extents, DEF_SYNC_AL_EXTENTS);
- if( cn.sconf.skip ) printf("\tskip-sync;\n");
- if( cn.sconf.use_csums ) printf("\tuse-csums;\n");
printf("}\n");
err=fstat(drbd_fd,&sb);
More information about the drbd-cvs
mailing list