From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 5 Dec 2006 22:26:59 -0000
Subject: [Cluster-devel] cluster/gfs2/mount util.c
Message-ID: <20061205222659.11826.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	teigland at sourceware.org	2006-12-05 22:26:58

Modified files:
	gfs2/mount     : util.c 

Log message:
	Pass gfs_controld the device being mounted, it'll use this if it
	needs to withdraw the fs.
	bz 215962

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/util.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18&r2=1.18.2.1

--- cluster/gfs2/mount/util.c	2006/10/25 06:24:43	1.18
+++ cluster/gfs2/mount/util.c	2006/12/05 22:26:58	1.18.2.1
@@ -409,12 +409,12 @@
 
 	/*
 	 * send request to gfs_controld for it to join mountgroup:
-	 * "join <mountpoint> gfs2 lock_dlm <locktable> <options>"
+	 * "join <mountpoint> gfs2 lock_dlm <locktable> <options> <dev>"
 	 */
 
 	memset(buf, 0, sizeof(buf));
-	rv = snprintf(buf, MAXLINE, "join %s %s %s %s %s",
-		      dir, fsname, proto, table, options);
+	rv = snprintf(buf, MAXLINE, "join %s %s %s %s %s %s",
+		      dir, fsname, proto, table, options, mo->dev);
 	if (rv >= MAXLINE) {
 		warn("lock_dlm_join: message too long: %d \"%s\"", rv, buf);
 		rv = -1;