[DRBD-cvs] svn commit by phil - r2041 - trunk/drbd - Made it to compile again ; )

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2005-12-27 19:33:25 +0100 (Tue, 27 Dec 2005)
New Revision: 2041

Modified:
   trunk/drbd/drbd_proc.c
   trunk/drbd/drbd_receiver.c
   trunk/drbd/lru_cache.c
   trunk/drbd/lru_cache.h
Log:
Made it to compile again ;)


Modified: trunk/drbd/drbd_proc.c
===================================================================
--- trunk/drbd/drbd_proc.c	2005-12-27 18:24:36 UTC (rev 2040)
+++ trunk/drbd/drbd_proc.c	2005-12-27 18:33:25 UTC (rev 2041)
@@ -188,7 +188,7 @@
 		if ( drbd_conf[i].state.conn == StandAlone &&
 		     drbd_conf[i].state.disk == Diskless) {
 			seq_printf( seq, "%2d: cs:Unconfigured\n", i);
-		else
+		} else {
 			seq_printf( seq,
 			   "%2d: cs:%s st:%s/%s ds:%s/%s\n"
 			   "    ns:%u nr:%u dw:%u dr:%u al:%u bm:%u "
@@ -210,11 +210,11 @@
 			   atomic_read(&drbd_conf[i].unacked_cnt),
 			   atomic_read(&drbd_conf[i].ap_bio_cnt)
 			);
-
-		if ( drbd_conf[i].cstate == SyncSource ||
-		     drbd_conf[i].cstate == SyncTarget )
+		}
+		if ( drbd_conf[i].state.conn == SyncSource ||
+		     drbd_conf[i].state.conn == SyncTarget ) {
 			drbd_syncer_progress(drbd_conf+i,seq);
-
+		}
 		lc_printf_stats(seq,drbd_conf[i].resync);
 		lc_printf_stats(seq,drbd_conf[i].act_log);
 	}

Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2005-12-27 18:24:36 UTC (rev 2040)
+++ trunk/drbd/drbd_receiver.c	2005-12-27 18:33:25 UTC (rev 2041)
@@ -556,7 +556,7 @@
           Make sure to use 0 as portnumber, so linux selects
 	   a free one dynamically.
 	*/
-	memcpy (&src_in, &(mdev->conf.my_addr), sizeof(struct sockaddr_in));
+	memcpy (&src_in, &(mdev->net_conf->my_addr), sizeof(struct sockaddr_in));
 	src_in.sin_port = 0; 
 
 	err = sock->ops->bind(sock,

Modified: trunk/drbd/lru_cache.c
===================================================================
--- trunk/drbd/lru_cache.c	2005-12-27 18:24:36 UTC (rev 2040)
+++ trunk/drbd/lru_cache.c	2005-12-27 18:33:25 UTC (rev 2041)
@@ -28,6 +28,7 @@
 #include <linux/bitops.h>
 #include <linux/vmalloc.h>
 #include <linux/string.h> // for memset
+#include <linux/seq_file.h> // for seq_printf
 #include "lru_cache.h"
 
 #define STATIC static

Modified: trunk/drbd/lru_cache.h
===================================================================
--- trunk/drbd/lru_cache.h	2005-12-27 18:24:36 UTC (rev 2040)
+++ trunk/drbd/lru_cache.h	2005-12-27 18:33:25 UTC (rev 2041)
@@ -107,6 +107,7 @@
 extern unsigned int       lc_put (struct lru_cache* lc, struct lc_element* e);
 extern void            lc_changed(struct lru_cache* lc, struct lc_element* e);
 
+struct seq_file;
 extern size_t lc_printf_stats(struct seq_file *seq, struct lru_cache* lc);
 
 /* This can be used to stop lc_get from changing the set of active elements.