[Cluster-devel] cluster/gfs2/mount mount.gfs2.c util.c

[bmarzins at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	bmarzins at sourceware.org	2006-10-25 06:24:43

Modified files:
	gfs2/mount     : mount.gfs2.c util.c 

Log message:
	This is a bugfix for bz #211923.
	
	When can't mount a filesystem because you already have it mounted, or some
	similar reason, you print out a helpful message, so the user can fix the
	problem.

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

--- cluster/gfs2/mount/mount.gfs2.c	2006/10/14 20:16:19	1.19
+++ cluster/gfs2/mount/mount.gfs2.c	2006/10/25 06:24:43	1.20
@@ -190,6 +190,8 @@
 			umount_lockproto(proto, &mo, &sb, errno);
 
 		block_signals(SIG_UNBLOCK);
+		if (errno == EBUSY)
+			die("%s already mounted or %s busy\n", mo.dev, mo.dir);
 		die("error %d mounting %s on %s\n", errno, mo.dev, mo.dir);
 	}
 	log_debug("mount(2) ok");
--- cluster/gfs2/mount/util.c	2006/10/16 15:05:30	1.17
+++ cluster/gfs2/mount/util.c	2006/10/25 06:24:43	1.18
@@ -448,6 +448,10 @@
 	rv = atoi(buf);
 	if (rv < 0) {
 		warn("lock_dlm_join: gfs_controld join error: %d", rv);
+		if (rv == -EEXIST)
+			warn("lock_dlm_join: mountgroup already exists. "
+			     "Duplicate locktable name %s, or %s already "
+			     "mounted\n", table, mo->dev);
 		goto out;
 	}