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

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2007-08-06 19:23:40

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

Log message:
	Remove check_sys_fs() since it breaks on-demand fs module loading from the
	kernel (already changed on RHEL5 branch).
	Use strerror() instead of errno in another spot to be more user friendly.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/mount.gfs2.c.diff?cvsroot=cluster&r1=1.25&r2=1.26

--- cluster/gfs2/mount/mount.gfs2.c	2007/07/19 22:20:50	1.25
+++ cluster/gfs2/mount/mount.gfs2.c	2007/08/06 19:23:40	1.26
@@ -155,6 +155,7 @@
 		lock_dlm_leave(mo, sb, mnterr);
 }
 
+#if 0
 static void check_sys_fs(char *fsname)
 {
 	DIR *d;
@@ -176,6 +177,7 @@
 	die("fs type \"%s\" not found in /sys/fs/, is the module loaded?\n",
 	    fsname);
 }
+#endif
 
 int main(int argc, char **argv)
 {
@@ -199,7 +201,11 @@
 		exit(EXIT_SUCCESS);
 	}
 
-	check_sys_fs(fsname);
+	/* This breaks on-demand fs module loading from the kernel; could we
+	   try to load the module first here and then check again and fail if
+	   nothing?  I'd really like to avoid joining the group and then
+	   backing out if the mount fails to load the module. */
+	/* check_sys_fs(fsname); */
 
 	read_options(argc, argv, &mo);
 	check_options(&mo);
@@ -227,7 +233,8 @@
 
 		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);
+		die("error mounting %s on %s: %s\n", mo.dev, mo.dir,
+		    strerror(errno));
 	}
 	log_debug("mount(2) ok");
 	mount_result_lockproto(proto, &mo, &sb, 0);