[Cluster-devel] cluster/group/gfs_controld main.c
teigland at sourceware.org
teigland at sourceware.org
Tue Nov 28 20:52:24 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: teigland at sourceware.org 2006-11-28 20:52:23
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&r1=1.23&r2=1.24
--- cluster/group/gfs_controld/main.c 2006/11/27 22:42:36 1.23
+++ cluster/group/gfs_controld/main.c 2006/11/28 20:52:23 1.24
@@ -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]));
More information about the Cluster-devel
mailing list