Setting the error flag of the mntfs for which the share

is already mounted results in the mount point not being
removed when it times out. (Amd considers it an error
mntfs and thus umount becomse a no-op.)
From: Krisztian Kovacs <Kris.Kovacs@morganstanley.com>

diff --git a/ChangeLog b/ChangeLog
index 0dcfb3cae333142e4c8b8379b97aee22d940acd3..822ed152e4fc721adc5d4d7a41d7d692ffd088a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-12-10  Christos Zoulas <christos@zoulas.com>
 
+       * In the new am_loc scheme mounted mntfs structures still
+         have their mf_fo structure left intact. So when restart
+         creates a fake mntfs for an already mounted filesystem it
+         should not free mf_fo right away.
+         From: Krisztian Kovacs <Kris.Kovacs@morganstanley.com>
+
        * Setting the error flag of the mntfs for which the share
          is already mounted results in the mount point not being
          removed when it times out. (Amd considers it an error

diff --git a/amd/restart.c b/amd/restart.c
index 94d21c48071e80dc5459bc9b4e1aa3d906dc3abf..ef9ef780c5924844783174ed86e8e00e26d2b13b 100644 (file)
--- a/amd/restart.c
+++ b/amd/restart.c
@@ -87,11 +87,6 @@ restart_fake_mntfs(mntent_t *me, am_ops *fs_ops)
   if (mf->mf_refc == 1) {
     mf->mf_flags |= MFF_RESTART | MFF_MOUNTED;
     mf->mf_error = 0;               /* Already mounted correctly */
-    if (mf->mf_fo) {
-       free_opts(mf->mf_fo);
-       XFREE(mf->mf_fo);
-       mf->mf_fo = NULL;
-    }
     /*
      * Only timeout non-NFS entries
      */