[DRBD-cvs] svn commit by phil - r2157 - trunk/user - Still patching around this: Can drbdadm resize meta dat

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-04-19 12:38:50 +0200 (Wed, 19 Apr 2006)
New Revision: 2157

Modified:
   trunk/user/drbdmeta.c
Log:
Still patching around this: Can drbdadm resize meta data,
or can it not resize meta data issue.


Modified: trunk/user/drbdmeta.c
===================================================================
--- trunk/user/drbdmeta.c	2006-04-19 08:28:58 UTC (rev 2156)
+++ trunk/user/drbdmeta.c	2006-04-19 10:38:50 UTC (rev 2157)
@@ -903,14 +903,15 @@
 	cfg->al_offset = cfg->md_offset + cfg->md.al_offset * 512;
 	cfg->bm_offset = cfg->md_offset + cfg->md.bm_offset * 512;
 
+	// For the case that someone modified la_sect by hand..
+	if(cfg->md.la_sect*512 > cfg->md_offset) {
+		printf("la-size-sect was too big, fixed.\n");
+		cfg->md.la_sect = cfg->md_offset/512;
+	}
 	words = bm_words(cfg->md.la_sect, cfg->md.bm_bytes_per_bit);
 	cfg->bm_bytes = words * sizeof(long);
 
-#define max(x,y) ((x) > (y) ? (x) : (y))
-	// For the case that someone modified la_sect by hand..
-	cfg->bm_mmaped_length = 
-		max((u64)(cfg->md.md_size_sect - MD_BM_OFFSET_07)*512,
-		    (u64)cfg->bm_bytes);
+	cfg->bm_mmaped_length=(u64)(cfg->md.md_size_sect-MD_BM_OFFSET_07)*512;
 
 	//fprintf(stderr,"al_offset: "U64" (%d)\n", cfg->al_offset, cfg->md.al_offset);
 	//fprintf(stderr,"bm_offset: "U64" (%d)\n", cfg->bm_offset, cfg->md.bm_offset);