[Ocfs2-commits] mfasheh commits r1673 - branches/dlm-glue/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-11-23 20:43:45 -0600 (Tue, 23 Nov 2004)
New Revision: 1673

Modified:
   branches/dlm-glue/src/dlmglue.c
Log:
* just use group name as domain name.



Modified: branches/dlm-glue/src/dlmglue.c
===================================================================
--- branches/dlm-glue/src/dlmglue.c	2004-11-23 22:55:09 UTC (rev 1672)
+++ branches/dlm-glue/src/dlmglue.c	2004-11-24 02:43:45 UTC (rev 1673)
@@ -1264,7 +1264,6 @@
 int ocfs2_dlm_init(ocfs_super *osb)
 {
 	int status, pid;
-	char domain[NM_MAX_NAME_LEN];
 	u32 dlm_key;
 	dlm_ctxt *dlm = NULL;
 
@@ -1281,15 +1280,13 @@
 	}
 	wait_for_completion(&osb->vote_event_init);
 
-	memset(domain, 0, NM_MAX_NAME_LEN);
-	memcpy(domain, osb->uuid, MAX_VOL_ID_LENGTH);
-
 	/* used by the dlm code to make message headers unique, each
 	 * node in this domain must agree on this. For now we'll just
 	 * yank that off uuid. */
 	memcpy(&dlm_key, osb->uuid, sizeof(dlm_key));
 
-	dlm = dlm_register_domain(domain, osb->group_name, dlm_key);
+	/* for now, group_name == domain */
+	dlm = dlm_register_domain(osb->group_name, osb->group_name, dlm_key);
 	if (!dlm) {
 		/* This is a best guess on return value... */
 		status = -ENOMEM;