From mboxrd@z Thu Jan  1 00:00:00 1970
From: rpeterso@sourceware.org <rpeterso@sourceware.org>
Date: 1 Dec 2006 22:50:58 -0000
Subject: [Cluster-devel] cluster/gfs2/mount umount.gfs2.c
Message-ID: <20061201225058.25163.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:	rpeterso at sourceware.org	2006-12-01 22:50:58

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

Log message:
	Resolves: bz218134: GFS & GFS2: umount while busy gives bogus error
	message.

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

--- cluster/gfs2/mount/umount.gfs2.c	2006/07/28 13:58:10	1.12
+++ cluster/gfs2/mount/umount.gfs2.c	2006/12/01 22:50:58	1.12.2.1
@@ -130,9 +130,12 @@
 	parse_opts(&mo);
 
 	rv = umount(mo.dir);
-	if (rv)
-		die("error %d unmounting %s\n", errno, mo.dir);
-
+	if (rv) {
+		if (errno == EBUSY)
+			die("%s: device is busy.\n", mo.dir);
+		else
+			die("error %d unmounting %s\n", errno, mo.dir);
+	}
 	proto = select_lockproto(&mo, &sb);
 	umount_lockproto(proto, &mo, &sb);