From 874149c80c9f8252a9b11e9f9c070bc2cbc966c1 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Thu, 17 Jul 2008 15:07:48 +0000
Subject: [PATCH] 	* mount.cc (do_mount): Remove MOUNT_ENC code. 
 (oopts): Remove "managed" option. 	(mount_commands): Drop "managed"
 handling. 	* path.cc (oopts): Remove "managed" option. 	(getmntent):
 Remove MOUNT_ENC code.

---
 winsup/utils/ChangeLog |  8 ++++++++
 winsup/utils/mount.cc  | 24 +-----------------------
 winsup/utils/path.cc   |  5 +----
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index d0f455b97..c425e6f34 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-17  Corinna Vinschen  <corinna@vinschen.de>
+
+	* mount.cc (do_mount): Remove MOUNT_ENC code.
+	(oopts): Remove "managed" option.
+	(mount_commands): Drop "managed" handling.
+	* path.cc (oopts): Remove "managed" option.
+	(getmntent): Remove MOUNT_ENC code.
+
 2008-07-17  Corinna Vinschen  <corinna@vinschen.de>
 
 	* utils.sgml: Add id's to all examples.
diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc
index bb080ff1c..6739e3c9c 100644
--- a/winsup/utils/mount.cc
+++ b/winsup/utils/mount.cc
@@ -103,25 +103,6 @@ do_mount (const char *dev, const char *where, int flags)
 	}
     }
 
-  if (!force && flags & MOUNT_ENC)
-    {
-      DIR *dd = opendir (dev);
-      if (dd)
-	{
-	  struct dirent *d;
-	  while ((d = readdir (dd)))
-	    {
-	      if (d->d_name[0] != '.')
-		/* fall through */;
-	      else if (d->d_name[1] == '\0'
-		       || (d->d_name[1] == '.' && d->d_name[2] == '\0'))
-		continue;
-	      fprintf (stderr, "%s: error: don't use \"-o managed\" on non-empty directories\n", progname);
-	      exit (1);
-	    }
-	}
-    }
-
   if (mount (dev, where, flags))
     error (where);
 
@@ -192,8 +173,7 @@ struct opt
   {"exec", MOUNT_EXEC, 0},
   {"notexec", MOUNT_NOTEXEC, 0},
   {"cygexec", MOUNT_CYGWIN_EXEC, 0},
-  {"nosuid", 0, 0},
-  {"managed", MOUNT_ENC, 0}
+  {"nosuid", 0, 0}
 };
 
 static void
@@ -417,8 +397,6 @@ mount_commands (void)
 	  strcat (opts, " -E");
 	if (strstr (p->mnt_opts, ",cygexec"))
 	  strcat (opts, " -X");
-	if (strstr (p->mnt_opts, ",managed"))
-	  strcat (opts, " -o managed");
 	while ((c = strchr (p->mnt_fsname, '\\')) != NULL)
 	  *c = '/';
 	printf (format_mnt, opts, p->mnt_fsname, p->mnt_dir);
diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc
index 6e6b76039..5a6fe3bb7 100644
--- a/winsup/utils/path.cc
+++ b/winsup/utils/path.cc
@@ -298,8 +298,7 @@ struct opt
   {"exec", MOUNT_EXEC, 0},
   {"notexec", MOUNT_NOTEXEC, 0},
   {"cygexec", MOUNT_CYGWIN_EXEC, 0},
-  {"nosuid", 0, 0},
-  {"managed", MOUNT_ENC, 0}
+  {"nosuid", 0, 0}
 };
 
 static bool
@@ -843,8 +842,6 @@ getmntent (FILE *)
     strcat (mnt.mnt_opts, (char *) ",exec");
   else if (m->flags & MOUNT_NOTEXEC)
     strcat (mnt.mnt_opts, (char *) ",noexec");
-  if (m->flags & MOUNT_ENC)
-    strcat (mnt.mnt_opts, ",managed");
   if ((m->flags & MOUNT_CYGDRIVE))	/* cygdrive */
     strcat (mnt.mnt_opts, (char *) ",cygdrive");
   mnt.mnt_freq = 1;