From: Ion Badulescu <ib42@cs.columbia.edu>
Date: Tue, 27 Apr 2004 04:38:39 +0000 (+0000)
Subject: 	* amd/amfs_generic.c (amfs_lookup_one_mntfs): force FS_MKMNT on
X-Git-Tag: before-retrans-udp-tcp-split~36
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=e033a69ba239fccb51ebcbd25e54d6365d693595;p=am-utils-6.2.git

	* amd/amfs_generic.c (amfs_lookup_one_mntfs): force FS_MKMNT on
	the real mount of an autofs-based sublink
---

diff --git a/ChangeLog b/ChangeLog
index c7d26574..0b4a77f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-27  Ion Badulescu  <ionut@moisil.badula.org>
+
+	* amd/amfs_generic.c (amfs_lookup_one_mntfs): force FS_MKMNT on
+	the real mount of an autofs-based sublink
+
 2004-04-25  Ion Badulescu  <ionut@moisil.badula.org>
 
 	* amd/map.c (free_map_if_success): avoid dereferencing a pointer
diff --git a/amd/amfs_generic.c b/amd/amfs_generic.c
index 1265e36b..069b3d67 100644
--- a/amd/amfs_generic.c
+++ b/amd/amfs_generic.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: amfs_generic.c,v 1.23 2004/01/06 03:56:19 ezk Exp $
+ * $Id: amfs_generic.c,v 1.24 2004/04/27 04:38:40 ib42 Exp $
  *
  */
 
@@ -314,9 +314,15 @@ amfs_lookup_one_mntfs(am_node *new_mp, mntfs *mf, char *ivec,
 
 #ifdef HAVE_FS_AUTOFS
   if (new_mp->am_flags & AMF_AUTOFS) {
+    new_mf->mf_fsflags = new_mf->mf_ops->autofs_fs_flags;
     if (on_autofs)
       new_mf->mf_flags |= MFF_ON_AUTOFS;
-    new_mf->mf_fsflags = new_mf->mf_ops->autofs_fs_flags;
+    /*
+     * sublinks are treated differently, so they always require
+     * creating a mounpoint for the underlying f/s
+     */
+    if (fs_opts->opt_sublink)
+      new_mf->mf_fsflags |= FS_MKMNT;
   }
   /*
    * A new filesystem is an autofs filesystems if: