* [Cluster-devel] cluster/gfs2/mount umount.gfs2.c
@ 2006-06-22 20:58 teigland
0 siblings, 0 replies; 5+ messages in thread
From: teigland @ 2006-06-22 20:58 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: teigland at sourceware.org 2006-06-22 20:58:29
Modified files:
gfs2/mount : umount.gfs2.c
Log message:
remove debug printf
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/umount.gfs2.c.diff?cvsroot=cluster&r1=1.8&r2=1.9
--- cluster/gfs2/mount/umount.gfs2.c 2006/02/27 22:46:47 1.8
+++ cluster/gfs2/mount/umount.gfs2.c 2006/06/22 20:58:28 1.9
@@ -99,8 +99,6 @@
prog_name = argv[0];
- printf("%s called\n", prog_name);
-
if (!strstr(prog_name, "gfs"))
die("invalid umount helper name \"%s\"\n", prog_name);
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Cluster-devel] cluster/gfs2/mount umount.gfs2.c
@ 2006-12-01 22:50 rpeterso
0 siblings, 0 replies; 5+ messages in thread
From: rpeterso @ 2006-12-01 22:50 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: rpeterso at sourceware.org 2006-12-01 22:50:06
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&r1=1.12&r2=1.13
--- 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:05 1.13
@@ -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);
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Cluster-devel] cluster/gfs2/mount umount.gfs2.c
@ 2006-12-01 22:50 rpeterso
0 siblings, 0 replies; 5+ messages in thread
From: rpeterso @ 2006-12-01 22:50 UTC (permalink / raw)
To: cluster-devel.redhat.com
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);
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Cluster-devel] cluster/gfs2/mount umount.gfs2.c
@ 2006-12-01 22:51 rpeterso
0 siblings, 0 replies; 5+ messages in thread
From: rpeterso @ 2006-12-01 22:51 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL50
Changes by: rpeterso at sourceware.org 2006-12-01 22:51:18
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=RHEL50&r1=1.12&r2=1.12.4.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:51:18 1.12.4.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);
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Cluster-devel] cluster/gfs2/mount umount.gfs2.c
@ 2008-01-21 14:37 fabbione
0 siblings, 0 replies; 5+ messages in thread
From: fabbione @ 2008-01-21 14:37 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2008-01-21 14:37:56
Modified files:
gfs2/mount : umount.gfs2.c
Log message:
Add fake support for -r option at umount so we don't fail if gfs2 is not umounted
by it's init script.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/umount.gfs2.c.diff?cvsroot=cluster&r1=1.15&r2=1.16
--- cluster/gfs2/mount/umount.gfs2.c 2007/08/22 08:58:46 1.15
+++ cluster/gfs2/mount/umount.gfs2.c 2008/01/21 14:37:56 1.16
@@ -52,7 +52,7 @@
/* FIXME: check for "quiet" option and don't print in that case */
while (cont) {
- optchar = getopt(argc, argv, "fhVvX:");
+ optchar = getopt(argc, argv, "fhVvX:r");
switch (optchar) {
case EOF:
@@ -79,6 +79,9 @@
print_version();
exit(EXIT_SUCCESS);
+ case 'r':
+ break; /* used by umount to remount ro if umount fails */
+
default:
break;
}
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-01-21 14:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-22 20:58 [Cluster-devel] cluster/gfs2/mount umount.gfs2.c teigland
-- strict thread matches above, loose matches on Subject: below --
2006-12-01 22:50 rpeterso
2006-12-01 22:50 rpeterso
2006-12-01 22:51 rpeterso
2008-01-21 14:37 fabbione
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).