* libamu/mount_fs.c (mnt_flags): allow the use of the "nolock"

	option

	* include/am_defs.h: don't include <linux/fs.h> on a glibc2 system

	* include/am_compat.h: define the "nolock" mnttab option if the
	NONLM NFS mount option is defined

	* acconfig.h: added MNT2_NFS_OPT_NONLM

	* configure.in: added detection of the NONLM Linux NFS mount
	option; added a clarification for the library versioning rules and
	increased the patchlevel

diff --git a/ChangeLog b/ChangeLog
index f0af3f50704d7426215977220510d04598c2b1bf..a7fc84dade81c62531737a8a76a175243f6fdca8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2000-12-02  Ion Badulescu  <ionut@moisil.dev.hydraweb.com>
+
+       * libamu/mount_fs.c (mnt_flags): allow the use of the "nolock"
+       option
+
+       * include/am_defs.h: don't include <linux/fs.h> on a glibc2 system
+
+       * include/am_compat.h: define the "nolock" mnttab option if the
+       NONLM NFS mount option is defined
+
+       * acconfig.h: added MNT2_NFS_OPT_NONLM
+
+       * configure.in: added detection of the NONLM Linux NFS mount
+       option; added a clarification for the library versioning rules and
+       increased the patchlevel
+
 2000-11-27  Ion Badulescu  <ionut@moisil.dev.hydraweb.com>
 
        * libamu/wire.c (getwire_lookup): truncate the hostname to

diff --git a/acconfig.h b/acconfig.h
index 6ee3bd6d3695f327bf7328387a8923886531e630..4f6a98ec8b2d001995ae50386b1176ebf3762c57 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -619,6 +619,9 @@
 /* Get lease for lookup */
 #undef MNT2_NFS_OPT_NQLOOKLEASE
 
+/* Don't use locking */
+#undef MNT2_NFS_OPT_NONLM
+
 /* Use Nqnfs protocol */
 #undef MNT2_NFS_OPT_NQNFS
 

diff --git a/configure.in b/configure.in
index f47099b509dad08b5042ac4244ff91d304e0f117..8816d714607948a273e4173b55b0ea01f3caf083 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -35,10 +35,24 @@ AC_SUBST(VERSION)
 AC_NAME_VERSION($VERSION)
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 dnl SET (shared) library version.  Update it only before major release!
+dnl Clarification:
+dnl The major number should change when an incompatible change is made to
+dnl the API; the minor number should change when an API is added; the patch
+dnl level should change when an internal implementation change is made that
+dnl does not affect the API.
+dnl
+dnl In other words: if the major changes, the library is incompatible with
+dnl older ones; if the minor changes, the library is backwards compatible
+dnl with libraries using the same major; if the patchlevel changes, the
+dnl library is backward and forward compatible with libraries using the same
+dnl major and minor.
+dnl
+dnl For sanity, the lower numbers should be set to 0 when a higher number
+dnl is changed.
 dnl version info for am-utils-6.0.2:   3:2:1
 dnl version info for am-utils-6.0.3:   4:0:2
 dnl version info for am-utils-6.0.4:   4:1:2
-LIBTOOL_LDFLAGS="-version-info 4:1:2"
+LIBTOOL_LDFLAGS="-version-info 4:1:3"
 AC_SUBST(LIBTOOL_LDFLAGS)
 dnl ======================================================================
 
@@ -886,6 +900,7 @@ AC_CHECK_MNT2_NFS_OPTS(     \
        noconn          \
        nocto           \
        noint           \
+       nonlm           \
        nqnfs           \
        pgthresh        \
        posix           \

diff --git a/include/am_compat.h b/include/am_compat.h
index 89a0e851414d2bbe880abcc6879333e5f86325c8..639e9a1689449d5b28be0f868c95289b2aa50ba0 100644 (file)
--- a/include/am_compat.h
+++ b/include/am_compat.h
@@ -90,6 +90,10 @@
 # define MNTTAB_OPT_PROPLIST "proplist"
 #endif /* defined(MNT2_NFS_OPT_PROPLIST) && !defined(MNTTAB_OPT_PROPLIST) */
 
+#if defined(MNT2_NFS_OPT_NONLM) && !defined(MNTTAB_OPT_NOLOCK)
+# define MNTTAB_OPT_NOLOCK "nolock"
+#endif /* defined(MNT2_NFS_OPT_NONLM) && !defined(MNTTAB_OPT_NOLOCK) */
+
 /*
  * Complete MNTTAB_OPT_* options based on MNT2_CDFS_OPT_* mount options.
  */

diff --git a/include/am_defs.h b/include/am_defs.h
index 1b7386ddc01fc5378bb11fd620c467ebf0a636c5..4490894ac4d9a5280bff9c551560633b9a02fb82 100644 (file)
--- a/include/am_defs.h
+++ b/include/am_defs.h
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: am_defs.h,v 1.15.2.3 2000/05/26 23:40:50 ionut Exp $
+ * $Id: am_defs.h,v 1.15.2.4 2000/12/02 23:29:12 ib42 Exp $
  *
  */
 
@@ -493,8 +493,10 @@ struct ypall_callback;
 
 /*
  * Actions to take if <linux/fs.h> exists.
+ * There is no point in including this on a glibc2 system,
+ * we're only asking for trouble
  */
-#ifdef HAVE_LINUX_FS_H
+#if defined HAVE_LINUX_FS_H && (!defined __GLIBC__ || __GLIBC__ < 2)
 /*
  * There are various conflicts in definitions between RedHat Linux, newer
  * 2.2 kernels, and <netinet/in.h> and <linux/fs.h>.
@@ -574,7 +576,7 @@ struct ypall_callback;
 #  undef __KERNEL__
 # endif /* HAVE_LINUX_LIST_H */
 # include <linux/fs.h>
-#endif /* HAVE_LINUX_FS_H */
+#endif /* HAVE_LINUX_FS_H && (!__GLIBC__ || __GLIBC__ < 2) */
 
 #ifdef HAVE_CDFS_CDFS_MOUNT_H
 # include <cdfs/cdfs_mount.h>

diff --git a/libamu/mount_fs.c b/libamu/mount_fs.c
index 9f1735a70b466eb79d9eed2243e06a49faa0d8f4..8236ecec726eb8c56803da9b946f71b05a3cbca2 100644 (file)
--- a/libamu/mount_fs.c
+++ b/libamu/mount_fs.c
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: mount_fs.c,v 1.11.2.2 2000/11/24 21:29:15 ezk Exp $
+ * $Id: mount_fs.c,v 1.11.2.3 2000/12/02 23:29:13 ib42 Exp $
  *
  */
 
@@ -109,6 +109,10 @@ struct opt_tab mnt_flags[] =
   {MNTTAB_OPT_PROPLIST, MNT2_NFS_OPT_PROPLIST},
 #endif /* defined(MNT2_NFS_OPT_PROPLIST) && defined(MNTTAB_OPT_PROPLIST) */
 
+#if defined(MNT2_NFS_OPT_NONLM) && defined(MNTTAB_OPT_NOLOCK)
+  {MNTTAB_OPT_NOLOCK, MNT2_NFS_OPT_NONLM},
+#endif /* defined(MNT2_NFS_OPT_NONLM) && defined(MNTTAB_OPT_NOLOCK) */
+
   {0, 0}
 };