Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/umount.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/umount.c (modified) (5 diffs)

branches/3.3/mindi-busybox/util-linux/umount.c

@@ -31 +31 @@
 #include <mntent.h>
 #include <sys/mount.h>
+#ifndef MNT_DETACH
+# define MNT_DETACH 0x00000002
+#endif
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if defined(__dietlibc__)
@@ -82 +86 @@
 
     // MNT_FORCE and MNT_DETACH (from linux/fs.h) must match
-    // OPT_FORCE and OPT_LAZY, otherwise this trick won't work:
-    doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY));
+    // OPT_FORCE and OPT_LAZY.
+    BUILD_BUG_ON(OPT_FORCE != MNT_FORCE || OPT_LAZY != MNT_DETACH);
+    doForce = opt & (OPT_FORCE|OPT_LAZY);
 
     /* Get a list of mount points from mtab.  We read them all in now mostly
@@ -99 +104 @@
             bb_error_msg_and_die("can't open '%s'", bb_path_mtab_file);
     } else {
-        while (getmntent_r(fp, &me, bb_common_bufsiz1, sizeof(bb_common_bufsiz1))) {
+        setup_common_bufsiz();
+        while (getmntent_r(fp, &me, bb_common_bufsiz1, COMMON_BUFSIZE)) {
             /* Match fstype if passed */
             if (!match_fstype(&me, fstype))
@@ -148 +154 @@
         if (m) zapit = m->dir;
 
+// umount from util-linux 2.22.2 does not do this:
+// umount -f uses umount2(MNT_FORCE) immediately,
+// not trying umount() first.
+// (Strangely, umount -fl ignores -f: it is equivalent to umount -l.
+// We do pass both flags in this case)
+#if 0
         // Let's ask the thing nicely to unmount.
         curstat = umount(zapit);
 
-        // Force the unmount, if necessary.
+        // Unmount with force and/or lazy flags, if necessary.
         if (curstat && doForce)
+#endif
             curstat = umount2(zapit, doForce);
 
@@ -169 +182 @@
             } else {
                 status = EXIT_FAILURE;
-                bb_perror_msg("can't %sumount %s", (doForce ? "forcibly " : ""), zapit);
+                bb_perror_msg("can't unmount %s", zapit);
             }
         } else {