[DRBD-cvs] svn commit by phil - r2062 - trunk/user - GC based meta data (v06 and v07) does not have the MDF_

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-02-08 18:40:23 +0100 (Wed, 08 Feb 2006)
New Revision: 2062

Modified:
   trunk/user/drbdmeta.c
   trunk/user/drbdtool_common.c
Log:
GC based meta data (v06 and v07) does not have the MDF_WasUpToDate flag!
Removed this nonsense!


Modified: trunk/user/drbdmeta.c
===================================================================
--- trunk/user/drbdmeta.c	2006-02-08 15:00:42 UTC (rev 2061)
+++ trunk/user/drbdmeta.c	2006-02-08 17:40:23 UTC (rev 2062)
@@ -389,33 +389,17 @@
 void md_disk_06_to_cpu(struct md_cpu *cpu, const struct md_on_disk_06 *disk)
 {
 	int i;
-	u32 flags;
 
 	MEMSET(cpu, 0, sizeof(*cpu));
 	for (i = 0; i < GEN_CNT_SIZE; i++)
 		cpu->gc[i] = be32_to_cpu(disk->gc[i].be);
 	cpu->magic = be32_to_cpu(disk->magic.be);
-
-	/* 06 does not have the UpToDate flag, set it according to
-	   the Consistent Flag */
-	flags = cpu->gc[Flags];
-	if( flags & MDF_Consistent) flags = flags | MDF_WasUpToDate;
-	cpu->gc[Flags]=flags;
 }
 
 void md_cpu_to_disk_06(struct md_on_disk_06 *disk, struct md_cpu *cpu)
 {
 	int i;
-	u32 flags;
 
-	/* clear Consistent flag if UpToDate is not set*/
-	flags = cpu->gc[Flags];
-	if(!((flags & MDF_Consistent) && (flags & MDF_WasUpToDate))) {
-		flags &= ~MDF_Consistent;
-	}
-	flags &= ~MDF_WasUpToDate;
-	cpu->gc[Flags]=flags;
-
 	for (i = 0; i < GEN_CNT_SIZE; i++)
 		disk->gc[i].be = cpu_to_be32(cpu->gc[i]);
 	disk->magic.be = cpu_to_be32(cpu->magic);
@@ -448,7 +432,6 @@
 void md_disk_07_to_cpu(struct md_cpu *cpu, const struct md_on_disk_07 *disk)
 {
 	int i;
-	u32 flags;
 
 	MEMSET(cpu, 0, sizeof(*cpu));
 	cpu->la_sect = be64_to_cpu(disk->la_kb.be) << 1;
@@ -459,27 +442,12 @@
 	cpu->al_offset = be32_to_cpu(disk->al_offset.be);
 	cpu->al_nr_extents = be32_to_cpu(disk->al_nr_extents.be);
 	cpu->bm_offset = be32_to_cpu(disk->bm_offset.be);
-
-	/* 07 does not have the UpToDate flag, set it according to
-	   the Consistent Flag */
-	flags = cpu->gc[Flags];
-	if( flags & MDF_Consistent) flags = flags | MDF_WasUpToDate;
-	cpu->gc[Flags]=flags;
 }
 
 void md_cpu_to_disk_07(struct md_on_disk_07 *disk, struct md_cpu *cpu)
 {
 	int i;
-	u32 flags;
 
-	/* clear Consistent flag if UpToDate is not set*/
-	flags = cpu->gc[Flags];
-	if(!((flags & MDF_Consistent) && (flags & MDF_WasUpToDate))) {
-		flags &= ~MDF_Consistent;
-	}
-	flags &= ~MDF_WasUpToDate;
-	cpu->gc[Flags]=flags;
-
 	disk->la_kb.be = cpu_to_be64(cpu->la_sect >> 1);
 	for (i = 0; i < GEN_CNT_SIZE; i++)
 		disk->gc[i].be = cpu_to_be32(cpu->gc[i]);
@@ -1070,7 +1038,6 @@
 
 	do {
 		if (!m_strsep_bit(str, &md->gc[Flags], MDF_Consistent)) break;
-		if (!m_strsep_bit(str, &md->gc[Flags], MDF_WasUpToDate)) break;
 		if (!m_strsep_u32(str, &md->gc[HumanCnt])) break;
 		if (!m_strsep_u32(str, &md->gc[TimeoutCnt])) break;
 		if (!m_strsep_u32(str, &md->gc[ConnectedCnt])) break;
@@ -1100,15 +1067,11 @@
 	} while (0);
 }
 
-int m_outdate_gc(struct md_cpu *md)
+int m_outdate_gc(struct md_cpu *md __attribute((unused)))
 {
-	if ( !(md->gc[Flags] & MDF_Consistent) ) {
-		return 5;
-	}
+	fprintf(stderr, "Can not outdate GC based meta data!\n");
 
-	md->gc[Flags] &= ~MDF_WasUpToDate;
-
-	return 0;
+	return 5;
 }
 
 int m_outdate_uuid(struct md_cpu *md)

Modified: trunk/user/drbdtool_common.c
===================================================================
--- trunk/user/drbdtool_common.c	2006-02-08 15:00:42 UTC (rev 2061)
+++ trunk/user/drbdtool_common.c	2006-02-08 17:40:23 UTC (rev 2062)
@@ -282,9 +282,8 @@
 
 void dt_print_gc(const __u32* gen_cnt)
 {
-	printf("%d:%d:%d:%d:%d:%d:%d:%d:%d\n",
+	printf("%d:%d:%d:%d:%d:%d:%d:%d\n",
 	       gen_cnt[Flags] & MDF_Consistent ? 1 : 0,
-	       gen_cnt[Flags] & MDF_WasUpToDate ? 1 : 0,
 	       gen_cnt[HumanCnt],
 	       gen_cnt[TimeoutCnt],
 	       gen_cnt[ConnectedCnt],
@@ -297,20 +296,18 @@
 void dt_pretty_print_gc(const __u32* gen_cnt)
 {
 	printf("\n"
-	       "                                              WantFullSync |\n"
-	       "                                        ConnectedInd |     |\n"
-	       "                                     lastState |     |     |\n"
-	       "                            ArbitraryCnt |     |     |     |\n"
-	       "                      ConnectedCnt |     |     |     |     |\n"
-	       "                  TimeoutCnt |     |     |     |     |     |\n"
-	       "              HumanCnt |     |     |     |     |     |     |\n"
-	       "     WasUpToDate |     |     |     |     |     |     |     |\n"
-	       "Consistent |     |     |     |     |     |     |     |     |\n"
-	       "   --------+-----+-----+-----+-----+-----+-----+-----+-----+\n"
-	       "       %3s | %3s | %3d | %3d | %3d | %3d | %3s | %3s | %3s  \n"
+	       "                                        WantFullSync |\n"
+	       "                                  ConnectedInd |     |\n"
+	       "                               lastState |     |     |\n"
+	       "                      ArbitraryCnt |     |     |     |\n"
+	       "                ConnectedCnt |     |     |     |     |\n"
+	       "            TimeoutCnt |     |     |     |     |     |\n"
+	       "        HumanCnt |     |     |     |     |     |     |\n"
+	       "Consistent |     |     |     |     |     |     |     |\n"
+	       "   --------+-----+-----+-----+-----+-----+-----+-----+\n"
+	       "       %3s | %3d | %3d | %3d | %3d | %3s | %3s | %3s  \n"
 	       "\n",
 	       gen_cnt[Flags] & MDF_Consistent ? "1/c" : "0/i",
-	       gen_cnt[Flags] & MDF_WasUpToDate ? "1/y" : "0/n",
 	       gen_cnt[HumanCnt],
 	       gen_cnt[TimeoutCnt],
 	       gen_cnt[ConnectedCnt],