From: Christos Zoulas <christos@zoulas.com>
Date: Wed, 17 Sep 2008 20:09:47 +0000 (+0000)
Subject: Most recent kernels have trouble with trying to parse the pid hostname
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=1135f042fbb5d152f8b541b7edbca22564c16960;p=am-utils-6.0.git

Most recent kernels have trouble with trying to parse the pid hostname
and do locking. What before was a silent failure, now there is a warning
printed and the mount is rejected. This is the simplest fix:
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479884)
---

diff --git a/amd/amfs_toplvl.c b/amd/amfs_toplvl.c
index 26134a7..f63b48c 100644
--- a/amd/amfs_toplvl.c
+++ b/amd/amfs_toplvl.c
@@ -227,6 +227,11 @@ amfs_toplvl_mount(am_node *mp, mntfs *mf)
       xstrlcat(opts, toplvl_opts, sizeof(opts));
     }
 
+#ifdef MNTTAB_OPT_NOLOCK
+    xstrlcat(opts, ",", sizeof(opts));
+    xstrlcat(opts, MNTTAB_OPT_NOLOCK, sizeof(opts));
+#endif /* MNTTAB_OPT_NOLOCK */
+
 #ifdef MNTTAB_OPT_NOAC
     if (gopt.auto_attrcache == 0) {
       xstrlcat(opts, ",", sizeof(opts));