* mount.cc (mount_info::conv_to_win32_path): Remove unused code.

	* mount.h (class mount_info): Remove sys_mount_table_counter member.
	* shared_info.h (class shared_info): Ditto.
	(CURR_SHARED_MAGIC): Update.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1d3e2b9..c8e67b5 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-24  Corinna Vinschen  <corinna@vinschen.de>
 
+       * mount.cc (mount_info::conv_to_win32_path): Remove unused code.
+       * mount.h (class mount_info): Remove sys_mount_table_counter member.
+       * shared_info.h (class shared_info): Ditto.
+       (CURR_SHARED_MAGIC): Update.
+
+2011-05-24  Corinna Vinschen  <corinna@vinschen.de>
+
        * pinfo.h (struct _pinfo): Reduce size of progname array slightly.
        Explain why.
 

diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index e224211..7bb9195 100644 (file)
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -558,12 +558,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
                                unsigned *flags)
 {
   bool chroot_ok = !cygheap->root.exists ();
-  while (sys_mount_table_counter < cygwin_shared->sys_mount_table_counter)
-    {
-      int current = cygwin_shared->sys_mount_table_counter;
-      init ();
-      sys_mount_table_counter = current;
-    }
+
   MALLOC_CHECK;
 
   dev.devn = FH_FS;

diff --git a/winsup/cygwin/mount.h b/winsup/cygwin/mount.h
index 3ab1873..d8468c8 100644 (file)
--- a/winsup/cygwin/mount.h
+++ b/winsup/cygwin/mount.h
@@ -146,7 +146,6 @@ struct device;
 class mount_info
 {
  public:
-  DWORD sys_mount_table_counter;
   int nmounts;
   mount_item mount[MAX_MOUNTS];
 

diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h
index feb8ff1..8a6a3f8 100644 (file)
--- a/winsup/cygwin/shared_info.h
+++ b/winsup/cygwin/shared_info.h
@@ -30,7 +30,7 @@ public:
 /* Data accessible to all tasks */
 
 
-#define CURR_SHARED_MAGIC 0xb41ae342U
+#define CURR_SHARED_MAGIC 0x34e5bfa7U
 
 #define USER_VERSION   1
 #define CURR_USER_MAGIC 0x6112afb3U
@@ -44,7 +44,6 @@ class shared_info
   DWORD cb;
  public:
   DWORD heap_chunk;
-  DWORD sys_mount_table_counter;
   tty_list tty;
   LONG last_used_bindresvport;
   DWORD obcaseinsensitive;