[Drbd-dev] FW: [DRBD-cvs] svn commit by phil - r2453 - in trunk: drbd drbd/linuxuser - * Removed some explicit calls to drbd_thread_ ... funct

[Graham, Simon]

I think there may be a problem with this checkin (or I misunderstand) -- this checkin includes the following change to drbd_nl_net_conf:


Modified: trunk/drbd/drbd_nl.c
===================================================================
--- trunk/drbd/drbd_nl.c	2006-09-25 07:24:32 UTC (rev 2452)
+++ trunk/drbd/drbd_nl.c	2006-09-25 11:32:44 UTC (rev 2453)
@@ -934,8 +934,13 @@
 	struct crypto_tfm* tfm = NULL;
 	struct hlist_head *new_tl_hash = NULL;
 	struct hlist_head *new_ee_hash = NULL;
-	struct Drbd_Conf *odev;
+	drbd_dev *odev;
 
+	if (mdev->state.conn > StandAlone) {
+		retcode=HaveNetConfig;
+		goto fail;
+	}
+

This has the unfortunate side effect of blocking 'drbdadm connect' requests in any state other than Standalone - so I cant manually cause the network to be reconnected anymore -- is this supposed to be something I never have to do? Because right now my system is WFConnection on one side and Unconnected on the other...

Simon