Attachment 298724 Details for Bug 208103 – Proper patch to check mount points post undomount

[patch] Proper patch to check mount points post undomount

undomount.diff (text/plain), 2.37 KB, created by Joel Andres Granados on 2008-03-20 18:21:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joel Andres Granados

Created: 2008-03-20 18:21:06 UTC

Size: 2.37 KB

patch

obsolete

>--- undomounts.c-orig	2008-03-20 22:22:19.000000000 +0100
>+++ undomounts.c	2008-03-20 23:12:33.000000000 +0100
>@@ -66,7 +66,7 @@
> 
>     printf("\t%s", fs[this].name);
>     /* don't need to unmount /tmp.  it is busy anyway. */
>-    if (!testing) {
>+    if (!testing && strncmp (fs[this].name, "/proc", 5) != 0) {
> 	if (umount2(fs[this].name, 0) < 0) {
> 	    printf(" umount failed (%d)", errno);
> 	} else {
>@@ -189,6 +189,79 @@
> 	}
>     }
> 
>+    //for (i = 0; i < numFilesystems; i++) 
>+    //    free(filesystems[i].name);
>+
>+    numFilesystems = 0;
>+    /* FIXME debug, do it again, and check which filesystems are still
>+     * mounted, IT #93112 */
>+    fd = open("/proc/mounts", O_RDONLY, 0);
>+    if (fd < 1) {
>+	/* FIXME: was perror */
>+	printstr("failed to open /proc/mounts");
>+	sleep(2);
>+	return;
>+    }
>+
>+    size = read(fd, buf, sizeof(buf) - 1);
>+    buf[size] = '\0';
>+
>+    close(fd);
>+
>+    chptr = buf;
>+    while (*chptr) {
>+	device = chptr;
>+	while (*chptr != ' ') chptr++;
>+	*chptr++ = '\0';
>+	start = chptr;
>+	while (*chptr != ' ') chptr++;
>+	*chptr++ = '\0';
>+
>+	if (strcmp(start, "/") && strcmp(start, "/tmp") && 
>+            strcmp(start, "/dev")) {
>+	    filesystems[numFilesystems].name = strdup(start);
>+	    filesystems[numFilesystems].what = FS;
>+	    filesystems[numFilesystems].mounted = 1;
>+
>+	    stat(start, &sb);
>+	    if ((sb.st_dev >> 8) == 7) {
>+		filesystems[numFilesystems].loopDevice = sb.st_dev & 0xf;
>+	    } else {
>+		filesystems[numFilesystems].loopDevice = -1;
>+	    }
>+
>+	    numFilesystems++;
>+	}
>+
>+	while (*chptr != '\n') chptr++;
>+	chptr++;
>+    }
>+
>+    for (i = 0; i < 7; i++) {
>+	unlink("/tmp/loop");
>+	mknod("/tmp/loop", 0600 | S_IFBLK, (7 << 8) | i);
>+	if ((fd = open("/tmp/loop", O_RDONLY, 0)) >= 0) {
>+	    if (!ioctl(fd, LOOP_GET_STATUS, &li) && li.lo_name[0]) {
>+		filesystems[numFilesystems].name = strdup(li.lo_name);
>+		filesystems[numFilesystems].what = LOOP;
>+		filesystems[numFilesystems].mounted = 1;
>+		filesystems[numFilesystems].loopDevice = i;
>+		numFilesystems++;
>+	    }
>+
>+	    close(fd);
>+	}
>+    }
>+
>+    printf ("Still mounted:\n");
>+    for (i = 0; i < numFilesystems; i++) {
>+	if (filesystems[i].what == LOOP) {
>+	    printf ("loop device: /dev/loop%d\n", filesystems[i].loopDevice);
>+	} else {
>+            printf ("real fs: %s\n", filesystems[i].name);
>+	}
>+    }
>+
>     for (i = 0; i < numFilesystems; i++) 
>         free(filesystems[i].name);
> }

Actions: View | Diff

Attachments on bug 208103: 137140 | 137141 | 298724 | 299736 | 300063 | 300064 | 301816