* conf/autofs/autofs_linux.c (autofs_mount_fs): HACK: always use

	symlinks for host mounts; assorted fixes for the symlink mode

diff --git a/ChangeLog b/ChangeLog
index a42012d528f062e95c2377689c9d1df66beb4cf0..63645095fd841fe9f345a679680d10b6d4bc303c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-13  Ion Badulescu  <ion@guppy.limebrokerage.com>
+
+       * conf/autofs/autofs_linux.c (autofs_mount_fs): HACK: always use
+       symlinks for host mounts; assorted fixes for the symlink mode
+
 2003-08-05  Ion Badulescu  <ionut@moisil.badula.org>
 
        * conf/umount/umount_default.c (umount_fs): enable space hack

diff --git a/conf/autofs/autofs_linux.c b/conf/autofs/autofs_linux.c
index 8d6842fe8beaff3259c15b0f6523d01f7c468b28..ad2a1953ebcdfa5ebc23c1fc791fbcc1710a10c2 100644 (file)
--- a/conf/autofs/autofs_linux.c
+++ b/conf/autofs/autofs_linux.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: autofs_linux.c,v 1.35 2003/08/04 20:49:58 ib42 Exp $
+ * $Id: autofs_linux.c,v 1.36 2003/08/13 16:21:46 ib42 Exp $
  *
  */
 
@@ -571,11 +571,21 @@ autofs_mount_fs(am_node *mp, mntfs *mf)
     struct stat buf;
 
     /*
-     * we need to stat() the destination, because the bind mount does not
+     * HACK ALERT!
+     *
+     * Since the bind mount mechanism doesn't allow mountpoint crossing,
+     * we _must_ use symlinks for the host mount case. Otherwise we end up
+     * with a bunch of empty mountpoints...
+     */
+    if (mf->mf_ops == &amfs_host_ops)
+      goto use_symlink;
+
+    /*
+     * We need to stat() the destination, because the bind mount does not
      * follow symlinks and/or allow for non-existent destinations.
-     * we fall back to symlinks if there are problems.
+     * We fall back to symlinks if there are problems.
      *
-     * we need to temporarily change pgrp, otherwise our stat() won't
+     * We also need to temporarily change pgrp, otherwise our stat() won't
      * trigger whatever cascading mounts are needed.
      *
      * WARNING: we will deadlock if this function is called from the master
@@ -608,14 +618,16 @@ autofs_mount_fs(am_node *mp, mntfs *mf)
     if (err) {
       rmdir(mp->am_path);
       plog(XLOG_INFO, "autofs: bind-mounting %s -> %s failed", mp->am_path, target);
+      goto use_symlink;
     }
+    goto out;
   }
 #endif /* MNT2_GEN_OPT_BIND */
  use_symlink:
-  if (err) {
-    plog(XLOG_INFO, "autofs: symlinking %s -> %s", mp->am_path, target);
-    err = symlink(mp->am_path, target);
-  }
+  plog(XLOG_INFO, "autofs: symlinking %s -> %s", mp->am_path, target);
+  err = symlink(target, mp->am_path);
+
+ out:
   if (err)
     return errno;
   return 0;