From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 28 Nov 2006 20:52:40 -0000
Subject: [Cluster-devel] cluster/group/gfs_controld main.c
Message-ID: <20061128205240.18329.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-11-28 20:52:39

Modified files:
	group/gfs_controld: main.c 

Log message:
	the fix yesterday to prevent a segfault when mount failed mistakenly
	also changed the exit point from the function causing the error to not
	be written back to mount.gfs

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/main.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.5&r2=1.18.2.6

--- cluster/group/gfs_controld/main.c	2006/11/27 22:43:03	1.18.2.5
+++ cluster/group/gfs_controld/main.c	2006/11/28 20:52:39	1.18.2.6
@@ -293,13 +293,13 @@
 		/* ci, dir, type, proto, table, extra */
 		rv = do_mount(ci, argv[1], argv[2], argv[3], argv[4], argv[5],
 			      &mg);
+		fd = client[ci].fd;
+		fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
 		if (!rv) {
 			client[ci].mg = mg;
-			fd = client[ci].fd;
-			fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
 			mg->mount_client_fd = fd;
-			goto reply;
 		}
+		goto reply;
 	} else if (!strcmp(cmd, "mount_result")) {
 		got_mount_result(client[ci].mg, atoi(argv[3]));