Import am-utils 6.2,vendor/amd/6.2vendor/amd

Suggested by:	pfg@
Obtained from:	ftp://ftp.am-utils.org/pub/am-utils/

12 files changed, 2232 insertions, 24 deletions

diff --git a/conf/mount/mount_aix.c b/conf/mount/mount_aix.c
new file mode 100644
index 000000000000..6cb832611148
--- /dev/null
+++ b/conf/mount/mount_aix.c
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_aix.c
+ *
+ */
+
+/*
+ * AIX 5.x Mount helper
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
+
+#define	VMT_ROUNDUP(len) (4 * ((len + 3) / 4))
+#define VMT_ASSIGN(vp, idx, data, size) \
+	vp->vmt_data[idx].vmt_off = p - (char *) vp; \
+	vp->vmt_data[idx].vmt_size = size; \
+	memmove(p, data, size); \
+	p += VMT_ROUNDUP(size);
+
+/* missing external definitions from AIX's headers */
+extern int vmount(struct vmount *vmount, int size);
+
+
+static int
+aix5_mkvp(char *p, int gfstype, int flags, char *object, char *stub, char *host, char *info, int info_size, char *args)
+{
+  struct vmount *vp = (struct vmount *) p;
+
+  memset((voidp) vp, 0, sizeof(*vp));
+  /*
+   * Fill in standard fields
+   */
+  vp->vmt_revision = VMT_REVISION;
+  vp->vmt_flags = flags;
+  vp->vmt_gfstype = gfstype;
+
+  /*
+   * Fill in all variable length data
+   */
+  p += sizeof(*vp);
+
+  VMT_ASSIGN(vp, VMT_OBJECT, object, strlen(object) + 1);
+  VMT_ASSIGN(vp, VMT_STUB, stub, strlen(stub) + 1);
+  VMT_ASSIGN(vp, VMT_HOST, host, strlen(host) + 1);
+  VMT_ASSIGN(vp, VMT_HOSTNAME, host, strlen(host) + 1);
+  VMT_ASSIGN(vp, VMT_INFO, info, info_size);
+  VMT_ASSIGN(vp, VMT_ARGS, args, strlen(args) + 1);
+
+  /*
+   * Return length
+   */
+  return vp->vmt_length = p - (char *) vp;
+}
+
+
+/*
+ * Map from conventional mount arguments to AIX 3,x style arguments.
+ * But we avoid all the messy BIS stuff for AIX 5.x
+ */
+int
+mount_aix3(char *fsname, char *dir, int flags, int type, void *data, char *mnt_opts)
+{
+  char buf[4096];
+  int size, ret;
+  int real_size = sizeof(nfs_args_t); /* size passed to aix5_mkvp() */
+  char *real_args = data;	/* args passed to aix5_mkvp() */
+  char *host, *rfs, *idx;
+  int aix_type = type;
+#ifdef HAVE_FS_NFS3
+  struct nfs_args v2args;
+  nfs_args_t *v3args = (nfs_args_t *) data;
+#endif /* HAVE_FS_NFS3 */
+
+#ifdef DEBUG
+  dlog("mount_aix3: fsname %s, dir %s, type %d", fsname, dir, type);
+#endif /* DEBUG */
+
+  switch (aix_type) {
+
+  case MOUNT_TYPE_NFS:
+
+#ifdef HAVE_FS_NFS3
+    /*
+     * This is tricky.  If we have v3 support, but this nfs mount is v2,
+     * then I must copy the arguments from the v3 nfs_args to the v2 one.
+     */
+    memmove((voidp) &v2args.addr, (voidp) &v3args->addr, sizeof(struct sockaddr_in));
+    v2args.hostname = v3args->hostname;
+    v2args.netname = v3args->netname;
+    memmove((voidp) v2args.fh.x, v3args->fh, FHSIZE);
+    v2args.flags = v3args->flags;
+    v2args.wsize = v3args->wsize;
+    v2args.rsize = v3args->rsize;
+    v2args.timeo = v3args->timeo;
+    v2args.retrans = v3args->retrans;
+    v2args.acregmin = v3args->acregmin;
+    v2args.acregmax = v3args->acregmax;
+    v2args.acdirmin = v3args->acdirmin;
+    v2args.acdirmax = v3args->acdirmax;
+    v2args.pathconf = v3args->pathconf;
+
+    /* now set real_* stuff */
+    real_size = sizeof(v2args);
+    real_args = (char *) &v2args;
+
+  case MOUNT_TYPE_NFS3:
+#endif /* HAVE_FS_NFS3 */
+
+    idx = strchr(fsname, ':');
+    if (idx) {
+      *idx = '\0';
+      rfs = xstrdup(idx + 1);
+      host = xstrdup(fsname);
+      *idx = ':';
+    } else {
+      rfs = xstrdup(fsname);
+      host = xstrdup(am_get_hostname());
+    }
+
+    size = aix5_mkvp(buf, type, flags, rfs, dir, host,
+		     real_args, real_size, mnt_opts);
+    XFREE(rfs);
+    XFREE(host);
+    break;
+
+  case MOUNT_TYPE_UFS:
+    /* Need to open block device and extract log device info from sblk. */
+    return EINVAL;
+
+  default:
+    return EINVAL;
+  }
+
+  /*
+   * XXX: Warning, if vmount() hangs your amd in AIX 5.1, it
+   * is because of a kernel bug in the NFS code.  Get a patch from IBM
+   * or upgrade to 5.2.
+   */
+  ret = vmount((struct vmount *)buf, size);
+  if (ret < 0) {
+    plog(XLOG_ERROR, "mount_aix3: vmount failed with errno %d", errno);
+    perror ("vmount");
+  }
+  return ret;
+}
diff --git a/conf/mount/mount_aix3.c b/conf/mount/mount_aix3.c
new file mode 100644
index 000000000000..5e66791b270f
--- /dev/null
+++ b/conf/mount/mount_aix3.c
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_aix3.c
+ *
+ */
+
+/*
+ * AIX 3.x/4.x Mount helper
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
+
+#define	VMT_ROUNDUP(len) (4 * ((len + 3) / 4))
+#define VMT_ASSIGN(vp, idx, data, size) \
+	vp->vmt_data[idx].vmt_off = p - (char *) vp; \
+	vp->vmt_data[idx].vmt_size = size; \
+	memmove(p, data, size); \
+	p += VMT_ROUNDUP(size);
+
+/* missing external definitions from AIX's headers */
+extern int vmount(struct vmount *vmount, int size);
+
+
+static int
+aix3_mkvp(char *p, int gfstype, int flags, char *object, char *stub, char *host, char *info, int info_size, char *args)
+{
+  struct vmount *vp = (struct vmount *) p;
+
+  memset((voidp) vp, 0, sizeof(*vp));
+  /*
+   * Fill in standard fields
+   */
+  vp->vmt_revision = VMT_REVISION;
+  vp->vmt_flags = flags;
+  vp->vmt_gfstype = gfstype;
+
+  /*
+   * Fill in all variable length data
+   */
+  p += sizeof(*vp);
+
+  VMT_ASSIGN(vp, VMT_OBJECT, object, strlen(object) + 1);
+  VMT_ASSIGN(vp, VMT_STUB, stub, strlen(stub) + 1);
+  VMT_ASSIGN(vp, VMT_HOST, host, strlen(host) + 1);
+  VMT_ASSIGN(vp, VMT_HOSTNAME, host, strlen(host) + 1);
+  VMT_ASSIGN(vp, VMT_INFO, info, info_size);
+  VMT_ASSIGN(vp, VMT_ARGS, args, strlen(args) + 1);
+
+  /*
+   * Return length
+   */
+  return vp->vmt_length = p - (char *) vp;
+}
+
+
+/*
+ * Map from conventional mount arguments
+ * to AIX 3-style arguments.
+ */
+int
+mount_aix3(char *fsname, char *dir, int flags, int type, void *data, char *mnt_opts)
+{
+  char buf[4096];
+  int size, ret;
+  int real_size = sizeof(nfs_args_t); /* size passed to aix3_mkvp() */
+  char *real_args = data;	/* args passed to aix3_mkvp() */
+  char *host, *rfs, *idx;
+  int aix_type = type;
+#ifdef HAVE_FS_NFS3
+  struct nfs_args v2args;
+  nfs_args_t *v3args = (nfs_args_t *) data;
+#ifdef MOUNT_TYPE_NFS3_BIS
+  struct aix4_nfs_args_bis v3args_bis;
+#endif /* MOUNT_TYPE_NFS3_BIS */
+#endif /* HAVE_FS_NFS3 */
+
+#ifdef DEBUG
+  dlog("mount_aix3: fsname %s, dir %s, type %d", fsname, dir, type);
+#endif /* DEBUG */
+
+#ifdef MOUNT_TYPE_NFS3_BIS
+ retry_ibm_buggy_service_pack:
+#endif /* MOUNT_TYPE_NFS3_BIS */
+  switch (aix_type) {
+
+  case MOUNT_TYPE_NFS:
+
+#ifdef HAVE_FS_NFS3
+    /*
+     * This is tricky.  If we have v3 support, but this nfs mount is v2,
+     * then I must copy the arguments from the v3 nfs_args to the v2 one.
+     */
+    memmove((voidp) &v2args.addr, (voidp) &v3args->addr, sizeof(struct sockaddr_in));
+    v2args.hostname = v3args->hostname;
+    v2args.netname = v3args->netname;
+    memmove((voidp) v2args.fh, v3args->fh, FHSIZE);
+    v2args.flags = v3args->flags;
+    v2args.wsize = v3args->wsize;
+    v2args.rsize = v3args->rsize;
+    v2args.timeo = v3args->timeo;
+    v2args.retrans = v3args->retrans;
+    v2args.acregmin = v3args->acregmin;
+    v2args.acregmax = v3args->acregmax;
+    v2args.acdirmin = v3args->acdirmin;
+    v2args.acdirmax = v3args->acdirmax;
+    v2args.pathconf = v3args->pathconf;
+
+    /* now set real_* stuff */
+    real_size = sizeof(v2args);
+    real_args = (char *) &v2args;
+
+  case MOUNT_TYPE_NFS3:
+#ifdef MOUNT_TYPE_NFS3_BIS
+  case MOUNT_TYPE_NFS3_BIS:
+    /* just fall through */
+    if (aix_type == MOUNT_TYPE_NFS3_BIS) {
+      dlog("mount_aix3: creating alternate nfs3_args structure");
+      memmove((voidp) &v3args_bis.addr, (voidp) &v3args->addr, sizeof(struct sockaddr_in));
+      v3args_bis.syncaddr = v3args->syncaddr;
+      v3args_bis.proto = v3args->proto;
+      v3args_bis.hostname = v3args->hostname;
+      v3args_bis.netname = v3args->netname;
+      v3args_bis.fh = v3args->fh;
+      v3args_bis.flags = v3args->flags;
+      v3args_bis.wsize = v3args->wsize;
+      v3args_bis.rsize = v3args->rsize;
+      v3args_bis.timeo = v3args->timeo;
+      v3args_bis.retrans = v3args->retrans;
+      v3args_bis.acregmin = v3args->acregmin;
+      v3args_bis.acregmax = v3args->acregmax;
+      v3args_bis.acdirmin = v3args->acdirmin;
+      v3args_bis.acdirmax = v3args->acdirmax;
+      v3args_bis.pathconf = v3args->pathconf;
+      v3args_bis.biods = v3args->biods;
+      v3args_bis.numclust = v3args->numclust;
+      /* now set real_* stuff */
+      real_size = sizeof(v3args_bis);
+      real_args = (char *) &v3args_bis;
+    }
+#endif /* MOUNT_TYPE_NFS3_BIS */
+#endif /* HAVE_FS_NFS3 */
+
+    idx = strchr(fsname, ':');
+    if (idx) {
+      *idx = '\0';
+      rfs = xstrdup(idx + 1);
+      host = xstrdup(fsname);
+      *idx = ':';
+    } else {
+      rfs = xstrdup(fsname);
+      host = xstrdup(am_get_hostname());
+    }
+
+    size = aix3_mkvp(buf, type, flags, rfs, dir, host,
+		     real_args, real_size, mnt_opts);
+    XFREE(rfs);
+    XFREE(host);
+    break;
+
+  case MOUNT_TYPE_UFS:
+    /* Need to open block device and extract log device info from sblk. */
+    return EINVAL;
+
+  default:
+    return EINVAL;
+  }
+
+  /*
+   * XXX: Warning, if vmount() hangs your amd in AIX 5.1, it
+   * is because of a kernel bug in the NFS code.  Get a patch from IBM
+   * or upgrade to 5.2.
+   */
+  ret = vmount((struct vmount *)buf, size);
+  if (ret < 0) {
+    plog(XLOG_ERROR, "mount_aix3: vmount failed with errno %d", errno);
+    perror ("vmount");
+#ifdef MOUNT_TYPE_NFS3_BIS
+    if (aix_type == MOUNT_TYPE_NFS3 && errno == EINVAL) {
+      aix_type = MOUNT_TYPE_NFS3_BIS;
+#ifdef DEBUG
+      dlog("mount_aix3: retrying with alternate nfs3_args structure");
+#endif /* DEBUG */
+      goto retry_ibm_buggy_service_pack;
+    }
+#endif /* MOUNT_TYPE_NFS3_BIS */
+  }
+  return ret;
+}
diff --git a/conf/mount/mount_bsdi3.c b/conf/mount/mount_bsdi3.c
new file mode 100644
index 000000000000..bb39f99a6ce1
--- /dev/null
+++ b/conf/mount/mount_bsdi3.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_bsdi3.c
+ *
+ */
+
+/*
+ * BSD/OS 3 Mount helper
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
diff --git a/conf/mount/mount_default.c b/conf/mount/mount_default.c
index 1bdf52293cfe..9e85e1601719 100644
--- a/conf/mount/mount_default.c
+++ b/conf/mount/mount_default.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2003 Erez Zadok
+ * Copyright (c) 1997-2014 Erez Zadok
  * Copyright (c) 1990 Jan-Simon Pendry
  * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,9 +32,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      %W% (Berkeley) %G%
  *
- * $Id: mount_default.c,v 1.1.2.3 2002/12/27 22:44:48 ezk Exp $
+ * File: am-utils/conf/mount/mount_default.c
  */
 
 /*
diff --git a/conf/mount/mount_hpux.c b/conf/mount/mount_hpux.c
new file mode 100644
index 000000000000..5a0e02046695
--- /dev/null
+++ b/conf/mount/mount_hpux.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_hpux.c
+ *
+ */
+
+/*
+ * HPUX:
+ * HPUX 9.0 and 10.0 Mount helper.
+ *      -Erez Zadok <ezk@cs.columbia.edu>
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
+
+
+/*
+ * Map from conventional mount arguments
+ * to HPUX style arguments.
+ */
+int
+mount_hpux(MTYPE_TYPE type, const char *dir, int flags, caddr_t data)
+{
+
+#if defined(MOUNT_TYPE_NFS) && defined(MOUNT_NFS)
+  if (STREQ(type, MOUNT_TYPE_NFS))
+    return vfsmount(MOUNT_NFS, dir, flags, data);
+#endif /* defined(MOUNT_TYPE_NFS) && defined(MOUNT_NFS) */
+
+#if defined(MOUNT_TYPE_UFS) && defined(MOUNT_UFS)
+  if (STREQ(type, MOUNT_TYPE_UFS))
+    return vfsmount(MOUNT_UFS, dir, flags, data);
+#endif /* defined(MOUNT_TYPE_UFS) && defined(MOUNT_UFS) */
+
+#if defined(MOUNT_TYPE_PCFS) && defined(MOUNT_PC)
+  /*
+   * MOUNT_TYPE_PCFS gets redefined in conf/trap/trap_hpux.h because of
+   * stupidities in HPUX 9.0's headers.
+   */
+  if (STREQ(type, MOUNT_TYPE_PCFS))
+    return vfsmount(MOUNT_PC, dir, flags, data);
+#endif /* defined(MOUNT_TYPE_PCFS) && defined(MOUNT_PC) */
+
+#if defined(MOUNT_TYPE_CDFS) && defined(MOUNT_CDFS)
+  if (STREQ(type, MOUNT_TYPE_CDFS))
+    return vfsmount(MOUNT_CDFS, dir, flags, data);
+#endif /* defined(MOUNT_TYPE_CDFS) && defined(MOUNT_CDFS) */
+
+  return EINVAL;
+}
diff --git a/conf/mount/mount_irix5.c b/conf/mount/mount_irix5.c
new file mode 100644
index 000000000000..359e55a8333e
--- /dev/null
+++ b/conf/mount/mount_irix5.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_irix5.c
+ *
+ */
+
+/*
+ * IRIX Mount helper
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
+
+
+/*
+ * Map from conventional mount arguments
+ * to IRIX style arguments.
+ *
+ * NOTE: We have to use struct nfs_args (not nfs_args_t) below because
+ * while IRIX5.3 needs the fh_len field added to struct nfs_args for NFS3
+ * mounts to succeed, the the mount syscall fails if the argument size
+ * includes fh_len! Talk about a broken interface ...  -- stolcke 7/4/97
+ */
+int
+mount_irix(char *fsname, char *dir, int flags, MTYPE_TYPE type, voidp data)
+{
+
+#ifdef DEBUG
+  dlog("mount_irix: fsname %s, dir %s, type %d", fsname, dir, type);
+#endif /* DEBUG */
+
+#ifdef HAVE_FS_NFS3
+  if (STREQ(type, MOUNT_TYPE_NFS3))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (struct nfs_args *) data, sizeof(struct nfs_args));
+#endif /* HAVE_FS_NFS3 */
+
+#ifdef HAVE_FS_NFS
+  if (STREQ(type, MOUNT_TYPE_NFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (struct nfs_args *) data, sizeof(struct nfs_args));
+#endif /* HAVE_FS_NFS */
+
+  /* XXX: do I need to pass {u,x,e}fs_args ? */
+
+#ifdef HAVE_FS_UFS
+  if (STREQ(type, MOUNT_TYPE_UFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | flags), type);
+#endif /* HAVE_FS_UFS */
+
+#ifdef HAVE_FS_EFS
+  if (STREQ(type, MOUNT_TYPE_EFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | flags), type);
+#endif /* HAVE_FS_EFS */
+
+#ifdef HAVE_FS_XFS
+  if (STREQ(type, MOUNT_TYPE_XFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | flags), type);
+#endif /* HAVE_FS_XFS */
+
+  return EINVAL;
+}
diff --git a/conf/mount/mount_irix6.c b/conf/mount/mount_irix6.c
new file mode 100644
index 000000000000..b0eb55bd6333
--- /dev/null
+++ b/conf/mount/mount_irix6.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_irix6.c
+ *
+ */
+
+/*
+ * IRIX Mount helper
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
+
+
+/*
+ * Map from conventional mount arguments
+ * to IRIX style arguments.
+ */
+int
+mount_irix(char *fsname, char *dir, int flags, MTYPE_TYPE type, voidp data)
+{
+
+#ifdef DEBUG
+  dlog("mount_irix: fsname %s, dir %s, type %s", fsname, dir, type);
+#endif /* DEBUG */
+
+#ifdef HAVE_FS_NFS3
+  if (STREQ(type, MOUNT_TYPE_NFS3))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (nfs_args_t *) data, sizeof(nfs_args_t));
+#endif /* HAVE_FS_NFS3 */
+
+#ifdef HAVE_FS_NFS
+  if (STREQ(type, MOUNT_TYPE_NFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (nfs_args_t *) data, sizeof(nfs_args_t));
+#endif /* HAVE_FS_NFS */
+
+#ifdef HAVE_FS_UFS
+  if (STREQ(type, MOUNT_TYPE_UFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (ufs_args_t *) data, sizeof(ufs_args_t));
+#endif /* HAVE_FS_UFS */
+
+#ifdef HAVE_FS_XFS
+  if (STREQ(type, MOUNT_TYPE_XFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (xfs_args_t *) data, sizeof(xfs_args_t));
+#endif /* HAVE_FS_XFS */
+
+#ifdef HAVE_FS_EFS
+  if (STREQ(type, MOUNT_TYPE_EFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (efs_args_t *) data, sizeof(efs_args_t));
+#endif /* HAVE_FS_EFS */
+
+#ifdef HAVE_FS_AUTOFS
+  if (STREQ(type, MOUNT_TYPE_AUTOFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (autofs_args_t *) data, sizeof(autofs_args_t));
+#endif /* HAVE_FS_AUTOFS */
+
+#ifdef HAVE_FS_LOFS
+  if (STREQ(type, MOUNT_TYPE_LOFS))
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (char *) NULL, 0);
+#endif /* HAVE_FS_LOFS */
+
+  return EINVAL;
+}
diff --git a/conf/mount/mount_isc3.c b/conf/mount/mount_isc3.c
new file mode 100644
index 000000000000..0896a31b5b40
--- /dev/null
+++ b/conf/mount/mount_isc3.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_isc3.c
+ */
+
+/*
+ * IX/386 Mount helper
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
+
+
+/*
+ * Map from conventional mount arguments
+ * to IX/386 style arguments.
+ */
+int
+mount_isc3(char *fsname, char *dir, int flags, int type, void *data)
+{
+
+#ifdef DEBUG
+  dlog("mount_isc3: fsname %s, dir %s, type %d", fsname, dir, type);
+#endif /* DEBUG */
+
+  if (type == MOUNT_TYPE_NFS)
+    return mount("/dev/nfsd", dir,
+		 (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_DATA | flags),
+		 type, (struct nfs_args *) data,
+		 sizeof(struct nfs_args));
+
+  if (type == MOUNT_TYPE_UFS)
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | flags), type);
+
+  return EINVAL;
+}
diff --git a/conf/mount/mount_linux.c b/conf/mount/mount_linux.c
new file mode 100644
index 000000000000..d3841cedc5f7
--- /dev/null
+++ b/conf/mount/mount_linux.c
@@ -0,0 +1,1153 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_linux.c
+ */
+
+/*
+ * Linux mount helper.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
+#include <nfs_common.h>
+
+#ifdef HAVE_RPC_AUTH_H
+# include <rpc/auth.h>
+#endif
+
+#ifndef MOUNT_TYPE_UFS
+/*
+ * Autoconf didn't find any disk-based f/s on this system,
+ * So provide some default definition for this file to compile.
+ */
+# define MOUNT_TYPE_UFS		"no_disk_fs"
+#endif /* not MOUNT_TYPE_UFS */
+
+struct opt_map {
+  const char *opt;		/* option name */
+  int inv;			/* true if flag value should be inverted */
+  int mask;			/* flag mask value */
+};
+
+const struct opt_map opt_map[] =
+{
+  {"defaults",		0,	0},
+  {MNTTAB_OPT_RO,	0,	MNT2_GEN_OPT_RDONLY},
+  {MNTTAB_OPT_RW,	1,	MNT2_GEN_OPT_RDONLY},
+  {MNTTAB_OPT_EXEC,	1,	MNT2_GEN_OPT_NOEXEC},
+  {MNTTAB_OPT_NOEXEC,	0,	MNT2_GEN_OPT_NOEXEC},
+  {MNTTAB_OPT_SUID,	1,	MNT2_GEN_OPT_NOSUID},
+  {MNTTAB_OPT_NOSUID,	0,	MNT2_GEN_OPT_NOSUID},
+#ifdef MNT2_GEN_OPT_NODEV
+  {MNTTAB_OPT_NODEV,	0,	MNT2_GEN_OPT_NODEV},
+#endif /* MNT2_GEN_OPT_NODEV */
+#ifdef MNT2_GEN_OPT_SYNC
+  {MNTTAB_OPT_SYNC,	0,	MNT2_GEN_OPT_SYNC},
+  {MNTTAB_OPT_ASYNC,	1,	MNT2_GEN_OPT_SYNC},
+#endif /* MNT2_GEN_OPT_SYNC */
+#ifdef MNT2_GEN_OPT_NOSUB
+  {MNTTAB_OPT_SUB,	1,	MNT2_GEN_OPT_NOSUB},
+  {MNTTAB_OPT_NOSUB,	0,	MNT2_GEN_OPT_NOSUB},
+#endif /* MNT2_GEN_OPT_NOSUB */
+#ifdef MNT2_GEN_OPT_SYNCHRONOUS
+  {"synchronous",	0,	MNT2_GEN_OPT_SYNCHRONOUS},
+#endif /* MNT2_GEN_OPT_SYNCHRONOUS */
+#ifdef MNT2_GEN_OPT_MANDLOCK
+  {"mandlock",		0,	MNT2_GEN_OPT_MANDLOCK},
+#endif /* MNT2_GEN_OPT_MANDLOCK */
+#ifdef MNT2_GEN_OPT_NOATIME
+  {"noatime",		0,	MNT2_GEN_OPT_NOATIME},
+#endif /* MNT2_GEN_OPT_NOATIME */
+#ifdef MNT2_GEN_OPT_NODIRATIME
+  {"nodiratime",	0,	MNT2_GEN_OPT_NODIRATIME},
+#endif /* MNT2_GEN_OPT_NODIRATIME */
+  {NULL,		0,	0}
+};
+
+struct fs_opts {
+  const char *opt;
+  int type;			/* XXX: Ion, what is this for? */
+};
+
+const struct fs_opts iso_opts[] = {
+  { "map",	0 },
+  { "norock",	0 },
+  { "cruft",	0 },
+  { "unhide",	0 },
+  { "conv",	1 },
+  { "block",	1 },
+  { "mode",	1 },
+  { "gid",	1 },
+  { "uid",	1 },
+  { NULL,	0 }
+};
+
+const struct fs_opts dos_opts[] = {
+  { "check",	1 },
+  { "conv",	1 },
+  { "uid",	1 },
+  { "gid",	1 },
+  { "umask",	1 },
+  { "debug",	0 },
+  { "fat",	1 },
+  { "quiet",	0 },
+  { "blocksize",1 },
+  { NULL,	0 }
+};
+
+const struct fs_opts autofs_opts[] = {
+  { "fd",	1 },
+  { "pgrp",	1 },
+  { "minproto",	1 },
+  { "maxproto",	1 },
+  { NULL,	0 }
+};
+
+const struct fs_opts lustre_opts[] = {
+  { "flock",		0 },
+  { "localflock",	0 },
+  { NULL,		0 }
+};
+
+const struct fs_opts null_opts[] = {
+  { NULL,	0 }
+};
+
+const struct fs_opts ext2_opts[] = {
+  { "check",			1 },
+  { "nocheck",			0 },
+  { "debug",			0 },
+  { "errors",			1 },
+  { "grpid",			0 },
+  { "nogrpid",			0 },
+  { "bsdgroups",		0 },
+  { "sysvgroups",		0 },
+  { "grpquota",			0 },
+  { "usrquota",			0 },
+  { "noquota",			0 },
+  { "quota",			0 },
+  { "nouid32",			0 },
+  { "oldalloc",			0 },
+  { "orlov",			0 },
+  { "resgid",			1 },
+  { "resuid",			1 },
+  { "sb",			1 },
+  { "user_xattr",		1 },
+  { "nouser_xattr",		1 },
+  { "journal_dev",		0 },
+  { "norecovery",		0 },
+  { "noload",			0 },
+  { "data",			1 },
+  { "barrier",			1 },
+  { "commit",			1 },
+  { "user_xattr",		0 },
+  { "nouser_xattr",		0 },
+  { "acl",			0 },
+  { "noacl",			0 },
+  { "bsddf",			0 },
+  { "minixdf",			0 },
+  { "usrjquota",		1 },
+  { "grpjquota",		1 },
+  { "jqfmt",			1 },
+  { NULL,	0 }
+};
+
+const struct fs_opts ext3_opts[] = {
+  { "check",			1 },
+  { "nocheck",			0 },
+  { "debug",			0 },
+  { "errors",			1 },
+  { "grpid",			0 },
+  { "nogrpid",			0 },
+  { "bsdgroups",		0 },
+  { "sysvgroups",		0 },
+  { "grpquota",			0 },
+  { "usrquota",			0 },
+  { "noquota",			0 },
+  { "quota",			0 },
+  { "nouid32",			0 },
+  { "oldalloc",			0 },
+  { "orlov",			0 },
+  { "resgid",			1 },
+  { "resuid",			1 },
+  { "sb",			1 },
+  { "user_xattr",		1 },
+  { "nouser_xattr",		1 },
+  { "journal",			1 },
+  { "journal_dev",		1 },
+  { "norecovery",		0 },
+  { "noload",			0 },
+  { "data",			1 },
+  { "barrier",			1 },
+  { "commit",			1 },
+  { "user_xattr",		0 },
+  { "nouser_xattr",		0 },
+  { "acl",			0 },
+  { "noacl",			0 },
+  { "bsddf",			0 },
+  { "minixdf",			0 },
+  { "usrjquota",		1 },
+  { "grpjquota",		1 },
+  { "jqfmt",			1 },
+  { NULL,	0 }
+};
+
+const struct fs_opts ext4_opts[] = {
+  { "debug",			0 },
+  { "errors",			1 },
+  { "grpid",			0 },
+  { "nogrpid",			0 },
+  { "bsdgroups",		0 },
+  { "sysvgroups",		0 },
+  { "grpquota",			0 },
+  { "usrquota",			0 },
+  { "noquota",			0 },
+  { "quota",			0 },
+  { "oldalloc",			0 },
+  { "orlov",			0 },
+  { "resgid",			1 },
+  { "resuid",			1 },
+  { "sb",			1 },
+  { "user_xattr",		1 },
+  { "nouser_xattr",		1 },
+  { "journal",			1 },
+  { "journal_dev",		1 },
+  { "noload",			0 },
+  { "data",			1 },
+  { "commit",			1 },
+  { "user_xattr",		0 },
+  { "nouser_xattr",		0 },
+  { "acl",			0 },
+  { "noacl",			0 },
+  { "bsddf",			0 },
+  { "minixdf",			0 },
+  { "usrjquota",		1 },
+  { "grpjquota",		1 },
+  { "jqfmt",			1 },
+  { "journal_checksum",		0 },
+  { "journal_async_commit",	0 },
+  { "journal",			1 },
+  { "barrier",			1 },
+  { "nobarrier",		0 },
+  { "inode_readahead_blks",	1 },
+  { "stripe",			1 },
+  { "delalloc",			0 },
+  { "nodelalloc",		0 },
+  { "min_batch_time",		1 },
+  { "mxn_batch_time",		1 },
+  { "journal_ioprio",		1 },
+  { "abort",			0 },
+  { "auto_da_alloc",		0 },
+  { "noauto_da_alloc",		0 },
+  { "discard",			0 },
+  { "nodiscard",		0 },
+  { "nouid32",			0 },
+  { "resize",			0 },
+  { "block_validity",		0 },
+  { "noblock_validity",		0 },
+  { "dioread_lock",		0 },
+  { "dioread_nolock",		0 },
+  { NULL,	0 }
+};
+
+
+/*
+ * New parser for linux-specific mounts.
+ * Should now handle fs-type specific mount-options correctly.
+ * Currently implemented: msdos, iso9660.
+ */
+static char *
+parse_opts(char *type, const char *optstr, int *flags, char **xopts, int *noauto)
+{
+  const struct opt_map *std_opts;
+  const struct fs_opts *dev_opts;
+  char *opt, *topts, *xoptstr;
+  size_t l;
+
+  if (optstr == NULL)
+    return NULL;
+
+  xoptstr = xstrdup(optstr);	/* because strtok is destructive below */
+
+  *noauto = 0;
+  l = strlen(optstr) + 2;
+  *xopts = (char *) xmalloc(l);
+  topts = (char *) xmalloc(l);
+  *topts = '\0';
+  **xopts = '\0';
+
+  for (opt = strtok(xoptstr, ","); opt; opt = strtok(NULL, ",")) {
+    /*
+     * First, parse standard options
+     */
+    std_opts = opt_map;
+    while (std_opts->opt &&
+	   !NSTREQ(std_opts->opt, opt, strlen(std_opts->opt)))
+      ++std_opts;
+    if (!(*noauto = STREQ(opt, MNTTAB_OPT_NOAUTO)) || std_opts->opt) {
+      xstrlcat(topts, opt, l);
+      xstrlcat(topts, ",", l);
+      if (std_opts->inv)
+	*flags &= ~std_opts->mask;
+      else
+	*flags |= std_opts->mask;
+    }
+    /*
+     * Next, select which fs-type is to be used
+     * and parse the fs-specific options
+     */
+#ifdef MOUNT_TYPE_AUTOFS
+    if (STREQ(type, MOUNT_TYPE_AUTOFS)) {
+      dev_opts = autofs_opts;
+      goto do_opts;
+    }
+#endif /* MOUNT_TYPE_AUTOFS */
+#ifdef MOUNT_TYPE_PCFS
+    if (STREQ(type, MOUNT_TYPE_PCFS)) {
+      dev_opts = dos_opts;
+      goto do_opts;
+    }
+#endif /* MOUNT_TYPE_PCFS */
+#ifdef MOUNT_TYPE_CDFS
+    if (STREQ(type, MOUNT_TYPE_CDFS)) {
+      dev_opts = iso_opts;
+      goto do_opts;
+    }
+#endif /* MOUNT_TYPE_CDFS */
+#ifdef MOUNT_TYPE_LOFS
+    if (STREQ(type, MOUNT_TYPE_LOFS)) {
+      dev_opts = null_opts;
+      goto do_opts;
+    }
+#endif /* MOUNT_TYPE_LOFS */
+#ifdef MOUNT_TYPE_LUSTRE
+    if (STREQ(type, MOUNT_TYPE_LUSTRE)) {
+      dev_opts = lustre_opts;
+      goto do_opts;
+    }
+#endif /* MOUNT_TYPE_LUSTRE */
+#ifdef MOUNT_TYPE_EXT2
+    if (STREQ(type, MOUNT_TYPE_EXT2)) {
+      dev_opts = ext2_opts;
+      goto do_opts;
+    }
+#endif /* MOUNT_TYPE_EXT2 */
+#ifdef MOUNT_TYPE_EXT3
+    if (STREQ(type, MOUNT_TYPE_EXT3)) {
+      dev_opts = ext3_opts;
+      goto do_opts;
+    }
+#endif /* MOUNT_TYPE_EXT3 */
+#ifdef MOUNT_TYPE_EXT4
+    if (STREQ(type, MOUNT_TYPE_EXT4)) {
+      dev_opts = ext4_opts;
+      goto do_opts;
+    }
+#endif /* MOUNT_TYPE_EXT4 */
+    plog(XLOG_FATAL, "linux mount: unknown fs-type: %s\n", type);
+    XFREE(xoptstr);
+    XFREE(*xopts);
+    XFREE(topts);
+    return NULL;
+
+do_opts:
+    while (dev_opts->opt &&
+	   (!NSTREQ(dev_opts->opt, opt, strlen(dev_opts->opt)))) {
+      ++dev_opts;
+    }
+    if (dev_opts->opt) {
+      xstrlcat(*xopts, opt, l);
+      xstrlcat(*xopts, ",", l);
+    }
+  }
+  /*
+   * All other options are discarded
+   */
+  if (strlen(*xopts))
+    *(*xopts + strlen(*xopts)-1) = '\0';
+  if (strlen(topts))
+    topts[strlen(topts)-1] = '\0';
+  XFREE(xoptstr);
+  return topts;
+}
+
+
+/*
+ * Returns combined linux kernel version number.  For a kernel numbered
+ * x.y.z, returns x*65535+y*256+z.
+ */
+int
+linux_version_code(void)
+{
+  char *token;
+  int shift = 16;
+  struct utsname my_utsname;
+  static int release = 0;
+
+  if ( release || uname(&my_utsname))
+    return release;
+
+  for (token = strtok(my_utsname.release, "."); token && (shift > -1); token = strtok(NULL, "."))
+  {
+     release |= (atoi(token) << shift);
+     shift -= 8;
+  }
+
+  return release;
+}
+
+
+int
+do_mount_linux(MTYPE_TYPE type, mntent_t *mnt, int flags, caddr_t data)
+{
+  if (amuDebug(D_FULL)) {
+    plog(XLOG_DEBUG, "do_mount_linux: fsname %s\n", mnt->mnt_fsname);
+    plog(XLOG_DEBUG, "do_mount_linux: type (mntent) %s\n", mnt->mnt_type);
+    plog(XLOG_DEBUG, "do_mount_linux: opts %s\n", mnt->mnt_opts);
+    plog(XLOG_DEBUG, "do_mount_linux: dir %s\n", mnt->mnt_dir);
+  }
+
+  /*
+   * If we have an nfs mount, the 5th argument to system mount() must be the
+   * nfs_mount_data structure, otherwise it is the return from parse_opts()
+   */
+  return mount(mnt->mnt_fsname,
+	       mnt->mnt_dir,
+	       type,
+	       MS_MGC_VAL | flags,
+	       data);
+}
+
+static void
+setup_nfs_args(struct nfs_common_args *ca)
+{
+  if (!ca->timeo) {
+#ifdef MNT2_NFS_OPT_TCP
+    if (ca->flags & MNT2_NFS_OPT_TCP)
+      ca->timeo = 600;
+    else
+#endif /* MNT2_NFS_OPT_TCP */
+      ca->timeo = 7;
+  }
+  if (!ca->retrans)
+    ca->retrans = 3;
+
+#ifdef MNT2_NFS_OPT_NOAC
+  if (!(ca->flags & MNT2_NFS_OPT_NOAC)) {
+    if (!(ca->flags & MNT2_NFS_OPT_ACREGMIN))
+      ca->acregmin = 3;
+    if (!(ca->flags & MNT2_NFS_OPT_ACREGMAX))
+      ca->acregmax = 60;
+    if (!(ca->flags & MNT2_NFS_OPT_ACDIRMIN))
+      ca->acdirmin = 30;
+    if (!(ca->flags & MNT2_NFS_OPT_ACDIRMAX))
+      ca->acdirmax = 60;
+  }
+#endif /* MNT2_NFS_OPT_NOAC */
+}
+
+
+int
+mount_linux_nfs(MTYPE_TYPE type, mntent_t *mnt, int flags, caddr_t data)
+{
+  nfs_args_t *mnt_data = (nfs_args_t *) data;
+  int errorcode;
+  struct nfs_common_args a;
+
+  /* Fake some values for linux */
+  mnt_data->version = NFS_MOUNT_VERSION;
+
+  put_nfs_common_args(mnt_data, a);
+  setup_nfs_args(&a);
+  get_nfs_common_args(mnt_data, a);
+
+  /*
+   * in nfs structure implementation version 4, the old
+   * filehandle field was renamed "old_root" and left as 3rd field,
+   * while a new field called "root" was added to the end of the
+   * structure. Both of them however need a copy of the file handle
+   * for NFSv2 mounts.
+   */
+#ifdef MNT2_NFS_OPT_VER3
+  if (mnt_data->flags & MNT2_NFS_OPT_VER3)
+    memset(mnt_data->old_root.data, 0, FHSIZE);
+  else
+#endif /* MNT2_NFS_OPT_VER3 */
+    memcpy(mnt_data->old_root.data, mnt_data->root.data, FHSIZE);
+
+#ifdef HAVE_NFS_ARGS_T_BSIZE
+  /* linux mount version 3 */
+  mnt_data->bsize = 0;			/* let the kernel decide */
+#endif /* HAVE_NFS_ARGS_T_BSIZE */
+
+#ifdef HAVE_NFS_ARGS_T_NAMLEN
+  /* linux mount version 2 */
+  mnt_data->namlen = NAME_MAX;		/* 256 bytes */
+#endif /* HAVE_NFS_ARGS_T_NAMELEN */
+
+#ifdef HAVE_NFS_ARGS_T_PSEUDOFLAVOR
+# ifdef HAVE_RPC_AUTH_H
+  mnt_data->pseudoflavor = AUTH_UNIX;
+# else
+  mnt_data->pseudoflavor = 0;
+# endif
+#endif /* HAVE_NFS_ARGS_T_PSEUDOFLAVOR */
+
+#ifdef HAVE_NFS_ARGS_T_CONTEXT
+  memset(mnt_data->context, 0, sizeof(mnt_data->context));
+#endif /* HAVE_NFS_ARGS_T_CONTEXT */
+
+  mnt_data->fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+  if (mnt_data->fd < 0) {
+    plog(XLOG_ERROR, "Can't create socket for kernel");
+    return 1;
+  }
+  if (bindresvport(mnt_data->fd, NULL) < 0) {
+    plog(XLOG_ERROR, "Can't bind to reserved port");
+    errorcode = 1;
+    goto out;
+  }
+  /*
+   * connect() the socket for kernels 1.3.10 and below
+   * only to avoid problems with multihomed hosts.
+   */
+  if (linux_version_code() <= 0x01030a) {
+    int ret = connect(mnt_data->fd,
+		      (struct sockaddr *) &mnt_data->addr,
+		      sizeof(mnt_data->addr));
+    if (ret < 0) {
+      plog(XLOG_ERROR, "Can't connect socket for kernel");
+      errorcode = 1;
+      goto out;
+    }
+  }
+  if (amuDebug(D_FULL)) {
+    plog(XLOG_DEBUG, "%s: type %s\n", __func__, type);
+    plog(XLOG_DEBUG, "%s: version %d\n", __func__, mnt_data->version);
+    plog(XLOG_DEBUG, "%s: fd %d\n", __func__, mnt_data->fd);
+    plog(XLOG_DEBUG, "%s: hostname %s\n", __func__,
+	 inet_ntoa(mnt_data->addr.sin_addr));
+    plog(XLOG_DEBUG, "%s: port %d\n", __func__,
+	 htons(mnt_data->addr.sin_port));
+  }
+  if (amuDebug(D_TRACE)) {
+    plog(XLOG_DEBUG, "%s: Generic mount flags 0x%x", __func__,
+	 MS_MGC_VAL | flags);
+    plog(XLOG_DEBUG, "%s: updated nfs_args...", __func__);
+    print_nfs_args(mnt_data, 0);
+  }
+
+  mnt_data->flags &= MNT2_NFS_OPT_FLAGMASK;
+
+  errorcode = do_mount_linux(type, mnt, flags, data);
+
+ out:
+  /*
+   * If we failed, (i.e. errorcode != 0), then close the socket
+   * if it is open.
+   */
+  if (errorcode && mnt_data->fd != -1) {
+    /* save errno, may be clobbered by close() call! */
+    int save_errno = errno;
+    close(mnt_data->fd);
+    errno = save_errno;
+  }
+  return errorcode;
+}
+
+#ifdef HAVE_FS_NFS4
+int
+mount_linux_nfs4(MTYPE_TYPE type, mntent_t *mnt, int flags, caddr_t data)
+{
+  nfs4_args_t *mnt_data = (nfs4_args_t *) data;
+  int errorcode;
+  struct nfs_common_args a;
+
+  /* Fake some values for linux */
+  mnt_data->version = NFS4_MOUNT_VERSION;
+
+  put_nfs_common_args(mnt_data, a);
+  setup_nfs_args(&a);
+  get_nfs_common_args(mnt_data, a);
+
+  if (amuDebug(D_FULL)) {
+    plog(XLOG_DEBUG, "%s: type %s\n", __func__, type);
+    plog(XLOG_DEBUG, "%s: version %d\n", __func__, mnt_data->version);
+  }
+  if (amuDebug(D_TRACE)) {
+    plog(XLOG_DEBUG, "%s: Generic mount flags 0x%x", __func__,
+	 MS_MGC_VAL | flags);
+    plog(XLOG_DEBUG, "%s: updated nfs_args...", __func__);
+    print_nfs_args(mnt_data, NFS_VERSION4);
+  }
+
+  errorcode = do_mount_linux(type, mnt, flags, data);
+
+  return errorcode;
+}
+#endif
+
+int
+mount_linux_nonfs(MTYPE_TYPE type, mntent_t *mnt, int flags, caddr_t data)
+{
+  char *extra_opts = NULL;
+  char *tmp_opts = NULL;
+  char *sub_type = NULL;
+  char *loopdev = NULL;
+  int noauto = 0;
+  int errorcode;
+
+  sub_type = hasmnteq(mnt, "type");
+  if (sub_type) {
+    sub_type = xstrdup(sub_type);
+    type = strpbrk(sub_type, ",:;\n\t");
+    if (type == NULL)
+      type = MOUNT_TYPE_UFS;
+    else {
+      *type = '\0';
+      type = sub_type;
+    }
+  }
+
+  if (!hasmntopt(mnt, "type"))
+    mnt->mnt_type = type;
+
+  tmp_opts = parse_opts(type, mnt->mnt_opts, &flags, &extra_opts, &noauto);
+
+#ifdef MOUNT_TYPE_LOFS
+  if (STREQ(type, MOUNT_TYPE_LOFS)) {
+# ifndef MNT2_GEN_OPT_BIND
+    size_t l;
+    /* this is basically a hack to support fist lofs */
+    XFREE(extra_opts);
+    l = strlen(mnt->mnt_fsname) + sizeof("dir=") + 1;
+    extra_opts = (char *) xmalloc(l);
+    xsnprintf(extra_opts, l, sizeof(extra_opts), "dir=%s", mnt->mnt_fsname);
+# else /* MNT2_GEN_OPT_BIND */
+    /* use bind mounts for lofs */
+    flags |= MNT2_GEN_OPT_BIND;
+# endif /* MNT2_GEN_OPT_BIND */
+    errorcode = do_mount_linux(type, mnt, flags, extra_opts);
+  } else /* end of "if type is LOFS" */
+#endif /* MOUNT_TYPE_LOFS */
+
+#ifdef MOUNT_TYPE_LUSTRE
+  if (STREQ(type, MOUNT_TYPE_LUSTRE)) {
+    char *topts;
+    if (*extra_opts)
+      topts = strvcat(extra_opts, ",device=", mnt->mnt_fsname, NULL);
+    else
+      topts = strvcat("device=", mnt->mnt_fsname, NULL);
+    free(extra_opts);
+    extra_opts = topts;
+  }
+#endif /* MOUNT_TYPE_LOFS */
+
+  {
+#ifdef HAVE_LOOP_DEVICE
+    /*
+     * If the mounted "device" is actually a regular file,
+     # try to attach a loop device to it.
+     */
+    struct stat buf;
+    char *old_fsname = NULL;
+    if (stat(mnt->mnt_fsname, &buf) == 0 &&
+	S_ISREG(buf.st_mode)) {
+      if ((loopdev = setup_loop_device(mnt->mnt_fsname)) != NULL) {
+	char *str;
+	size_t l;
+
+	plog(XLOG_INFO, "setup loop device %s over %s OK", loopdev, mnt->mnt_fsname);
+	old_fsname = mnt->mnt_fsname;
+	mnt->mnt_fsname = loopdev;
+	/* XXX: hack, append loop=/dev/loopX to mnttab opts */
+	l = strlen(mnt->mnt_opts) + 7 + strlen(loopdev);
+	str = (char *) xmalloc(l);
+	if (str) {
+	  xsnprintf(str, l, "%s,loop=%s", mnt->mnt_opts, loopdev);
+	  XFREE(mnt->mnt_opts);
+	  mnt->mnt_opts = str;
+	}
+      } else {
+	plog(XLOG_ERROR, "failed to set up a loop device: %m");
+	errorcode = 1;
+	goto out;
+      }
+    }
+#endif /* HAVE_LOOP_DEVICE */
+
+    errorcode = do_mount_linux(type, mnt, flags, extra_opts);
+
+#ifdef HAVE_LOOP_DEVICE
+    /* if mount failed and we used a loop device, then undo it */
+    if (errorcode != 0 && loopdev != NULL) {
+      if (delete_loop_device(loopdev) < 0)
+	plog(XLOG_WARNING, "mount() failed to release loop device %s: %m", loopdev);
+      else
+	plog(XLOG_INFO, "mount() released loop device %s OK", loopdev);
+    }
+    if (old_fsname)
+      mnt->mnt_fsname = old_fsname;
+#endif /* HAVE_LOOP_DEVICE */
+  }
+
+  /*
+   * Free all allocated space and return errorcode.
+   */
+out:
+if (loopdev)
+     XFREE(loopdev);
+  if (extra_opts != NULL)
+    XFREE(extra_opts);
+  if (tmp_opts != NULL)
+    XFREE(tmp_opts);
+  if (sub_type != NULL)
+    XFREE(sub_type);
+  return errorcode;
+}
+
+
+int
+mount_linux(MTYPE_TYPE type, mntent_t *mnt, int flags, caddr_t data)
+{
+  int errorcode;
+
+  if (mnt->mnt_opts && STREQ(mnt->mnt_opts, "defaults"))
+    mnt->mnt_opts = NULL;
+
+  if (type == NULL)
+    type = index(mnt->mnt_fsname, ':') ? MOUNT_TYPE_NFS : MOUNT_TYPE_UFS;
+
+#ifdef HAVE_FS_NFS4
+  if (STREQ(type, MOUNT_TYPE_NFS4))
+    errorcode = mount_linux_nfs4(type, mnt, flags, data);
+  else
+#endif
+  if (STREQ(type, MOUNT_TYPE_NFS))
+    errorcode = mount_linux_nfs(type, mnt, flags, data);
+  else				/* non-NFS mounts */
+    errorcode = mount_linux_nonfs(type, mnt, flags, data);
+
+  return errorcode;
+}
+
+
+/****************************************************************************/
+/*
+ * NFS error numbers and Linux errno's are two different things!  Linux is
+ * `worse' than other OSes in the respect that it loudly complains about
+ * undefined NFS return value ("bad NFS return value..").  So we should
+ * translate ANY possible Linux errno to their NFS equivalent.  Just, there
+ * aren't much NFS numbers, so most go to EINVAL or EIO.  The mapping below
+ * should fit at least for Linux/i386 and Linux/68k.  I haven't checked
+ * other architectures yet.
+ */
+
+#define NE_PERM		1
+#define NE_NOENT	2
+#define NE_IO		5
+#define NE_NXIO		6
+#define NE_AGAIN	11
+#define NE_ACCES	13
+#define NE_EXIST	17
+#define NE_NODEV	19
+#define NE_NOTDIR	20
+#define NE_ISDIR	21
+#define NE_INVAL	22
+#define NE_FBIG		27
+#define NE_NOSPC	28
+#define NE_ROFS		30
+#define NE_OPNOTSUPP	45
+#define NE_NAMETOOLONG	63
+#define NE_NOTEMPTY	66
+#define NE_DQUOT	69
+#define NE_STALE	70
+#define NE_REMOTE	71
+
+#define NFS_LOMAP	0
+#define NFS_HIMAP	122
+
+/*
+ * The errno's below are correct for Linux/i386. One day, somebody
+ * with lots of energy ought to verify them against the other ports...
+ */
+static int nfs_errormap[] = {
+	0,		/* success(0)		*/
+	NE_PERM,	/* EPERM (1)		*/
+	NE_NOENT,	/* ENOENT (2)		*/
+	NE_INVAL,	/* ESRCH (3)		*/
+	NE_IO,		/* EINTR (4)		*/
+	NE_IO,		/* EIO (5)		*/
+	NE_NXIO,	/* ENXIO (6)		*/
+	NE_INVAL,	/* E2BIG (7)		*/
+	NE_INVAL,	/* ENOEXEC (8)		*/
+	NE_INVAL,	/* EBADF (9)		*/
+	NE_IO,		/* ECHILD (10)		*/
+	NE_AGAIN,	/* EAGAIN (11)		*/
+	NE_IO,		/* ENOMEM (12)		*/
+	NE_ACCES,	/* EACCES (13)		*/
+	NE_INVAL,	/* EFAULT (14)		*/
+	NE_INVAL,	/* ENOTBLK (15)		*/
+	NE_IO,		/* EBUSY (16)		*/
+	NE_EXIST,	/* EEXIST (17)		*/
+	NE_INVAL,	/* EXDEV (18)		*/
+	NE_NODEV,	/* ENODEV (19)		*/
+	NE_NOTDIR,	/* ENOTDIR (20)		*/
+	NE_ISDIR,	/* EISDIR (21)		*/
+	NE_INVAL,	/* EINVAL (22)		*/
+	NE_IO,		/* ENFILE (23)		*/
+	NE_IO,		/* EMFILE (24)		*/
+	NE_INVAL,	/* ENOTTY (25)		*/
+	NE_ACCES,	/* ETXTBSY (26)		*/
+	NE_FBIG,	/* EFBIG (27)		*/
+	NE_NOSPC,	/* ENOSPC (28)		*/
+	NE_INVAL,	/* ESPIPE (29)		*/
+	NE_ROFS,	/* EROFS (30)		*/
+	NE_INVAL,	/* EMLINK (31)		*/
+	NE_INVAL,	/* EPIPE (32)		*/
+	NE_INVAL,	/* EDOM (33)		*/
+	NE_INVAL,	/* ERANGE (34)		*/
+	NE_INVAL,	/* EDEADLK (35)		*/
+	NE_NAMETOOLONG,	/* ENAMETOOLONG (36)	*/
+	NE_INVAL,	/* ENOLCK (37)		*/
+	NE_INVAL,	/* ENOSYS (38)		*/
+	NE_NOTEMPTY,	/* ENOTEMPTY (39)	*/
+	NE_INVAL,	/* ELOOP (40)		*/
+	NE_INVAL,	/* unused (41)		*/
+	NE_INVAL,	/* ENOMSG (42)		*/
+	NE_INVAL,	/* EIDRM (43)		*/
+	NE_INVAL,	/* ECHRNG (44)		*/
+	NE_INVAL,	/* EL2NSYNC (45)	*/
+	NE_INVAL,	/* EL3HLT (46)		*/
+	NE_INVAL,	/* EL3RST (47)		*/
+	NE_INVAL,	/* ELNRNG (48)		*/
+	NE_INVAL,	/* EUNATCH (49)		*/
+	NE_INVAL,	/* ENOCSI (50)		*/
+	NE_INVAL,	/* EL2HLT (51)		*/
+	NE_INVAL,	/* EBADE (52)		*/
+	NE_INVAL,	/* EBADR (53)		*/
+	NE_INVAL,	/* EXFULL (54)		*/
+	NE_INVAL,	/* ENOANO (55)		*/
+	NE_INVAL,	/* EBADRQC (56)		*/
+	NE_INVAL,	/* EBADSLT (57)		*/
+	NE_INVAL,	/* unused (58)		*/
+	NE_INVAL,	/* EBFONT (59)		*/
+	NE_INVAL,	/* ENOSTR (60)		*/
+	NE_INVAL,	/* ENODATA (61)		*/
+	NE_INVAL,	/* ETIME (62)		*/
+	NE_INVAL,	/* ENOSR (63)		*/
+	NE_INVAL,	/* ENONET (64)		*/
+	NE_INVAL,	/* ENOPKG (65)		*/
+	NE_INVAL,	/* EREMOTE (66)		*/
+	NE_INVAL,	/* ENOLINK (67)		*/
+	NE_INVAL,	/* EADV (68)		*/
+	NE_INVAL,	/* ESRMNT (69)		*/
+	NE_IO,		/* ECOMM (70)		*/
+	NE_IO,		/* EPROTO (71)		*/
+	NE_IO,		/* EMULTIHOP (72)	*/
+	NE_IO,		/* EDOTDOT (73)		*/
+	NE_INVAL,	/* EBADMSG (74)		*/
+	NE_INVAL,	/* EOVERFLOW (75)	*/
+	NE_INVAL,	/* ENOTUNIQ (76)	*/
+	NE_INVAL,	/* EBADFD (77)		*/
+	NE_IO,		/* EREMCHG (78)		*/
+	NE_IO,		/* ELIBACC (79)		*/
+	NE_IO,		/* ELIBBAD (80)		*/
+	NE_IO,		/* ELIBSCN (81)		*/
+	NE_IO,		/* ELIBMAX (82)		*/
+	NE_IO,		/* ELIBEXEC (83)	*/
+	NE_INVAL,	/* EILSEQ (84)		*/
+	NE_INVAL,	/* ERESTART (85)	*/
+	NE_INVAL,	/* ESTRPIPE (86)	*/
+	NE_INVAL,	/* EUSERS (87)		*/
+	NE_INVAL,	/* ENOTSOCK (88)	*/
+	NE_INVAL,	/* EDESTADDRREQ (89)	*/
+	NE_INVAL,	/* EMSGSIZE (90)	*/
+	NE_INVAL,	/* EPROTOTYPE (91)	*/
+	NE_INVAL,	/* ENOPROTOOPT (92)	*/
+	NE_INVAL,	/* EPROTONOSUPPORT (93) */
+	NE_INVAL,	/* ESOCKTNOSUPPORT (94) */
+	NE_INVAL,	/* EOPNOTSUPP (95)	*/
+	NE_INVAL,	/* EPFNOSUPPORT (96)	*/
+	NE_INVAL,	/* EAFNOSUPPORT (97)	*/
+	NE_INVAL,	/* EADDRINUSE (98)	*/
+	NE_INVAL,	/* EADDRNOTAVAIL (99)	*/
+	NE_IO,		/* ENETDOWN (100)	*/
+	NE_IO,		/* ENETUNREACH (101)	*/
+	NE_IO,		/* ENETRESET (102)	*/
+	NE_IO,		/* ECONNABORTED (103)	*/
+	NE_IO,		/* ECONNRESET (104)	*/
+	NE_IO,		/* ENOBUFS (105)	*/
+	NE_IO,		/* EISCONN (106)	*/
+	NE_IO,		/* ENOTCONN (107)	*/
+	NE_IO,		/* ESHUTDOWN (108)	*/
+	NE_IO,		/* ETOOMANYREFS (109)	*/
+	NE_IO,		/* ETIMEDOUT (110)	*/
+	NE_IO,		/* ECONNREFUSED (111)	*/
+	NE_IO,		/* EHOSTDOWN (112)	*/
+	NE_IO,		/* EHOSTUNREACH (113)	*/
+	NE_IO,		/* EALREADY (114)	*/
+	NE_IO,		/* EINPROGRESS (115)	*/
+	NE_STALE,	/* ESTALE (116)		*/
+	NE_IO,		/* EUCLEAN (117)	*/
+	NE_INVAL,	/* ENOTNAM (118)	*/
+	NE_INVAL,	/* ENAVAIL (119)	*/
+	NE_INVAL,	/* EISNAM (120)		*/
+	NE_IO,		/* EREMOTEIO (121)	*/
+	NE_DQUOT,	/* EDQUOT (122)		*/
+};
+
+
+int
+linux_nfs_error(int e)
+{
+  int ret = (nfsstat) NE_IO;
+
+  if (e < NFS_LOMAP || e > NFS_HIMAP)
+    ret = (nfsstat) NE_IO;
+  else
+    ret = nfs_errormap[e - NFS_LOMAP];
+  dlog("linux_nfs_error: map error %d to NFS error %d", e, ret);
+  return (nfsstat) ret;
+}
+
+
+#ifdef HAVE_LOOP_DEVICE
+/****************************************************************************/
+/*** LOOP DEVICE SUPPORT						  ***/
+/*** Loop Device setup code taken from mount-2.11g-5.src.rpm, which was   ***/
+/*** originally written bt Ted T'so and others.				  ***/
+/****************************************************************************/
+
+#define PROC_DEVICES	"/proc/devices"
+
+#if not_used_yet
+static int
+show_loop(char *device)
+{
+  struct loop_info loopinfo;
+  int fd;
+
+  if ((fd = open(device, O_RDONLY)) < 0) {
+    dlog("loop: can't open device %s: %m", device);
+    return -2;
+  }
+  if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) < 0) {
+    dlog("loop: can't get info on device %s: %m", device);
+    close(fd);
+    return -1;
+  }
+  dlog("show_loop: %s: [%04x]:%ld (%s)",
+       device, loopinfo.lo_device, loopinfo.lo_inode,
+       loopinfo.lo_name);
+
+  close(fd);
+
+  return 0;
+}
+
+
+static int
+is_loop_device(const char *device)
+{
+  struct stat statbuf;
+  int loopmajor = 7;
+
+  return (loopmajor && stat(device, &statbuf) == 0 &&
+	  S_ISBLK(statbuf.st_mode) &&
+	  (statbuf.st_rdev>>8) == loopmajor);
+}
+#endif /* not_used_yet */
+
+
+/*
+ * Just creating a device, say in /tmp, is probably a bad idea - people
+ * might have problems with backup or so.  So, we just try /dev/loop[0-7].
+ */
+static char *
+find_unused_loop_device(void)
+{
+  char dev[20];
+  char *loop_formats[] = { "/dev/loop%d", "/dev/loop/%d" };
+  int i, j, fd, somedev = 0, someloop = 0, loop_known = 0;
+  struct stat statbuf;
+  struct loop_info loopinfo;
+  FILE *procdev;
+
+#define LOOP_FMT_SIZE(a) (sizeof(a)/sizeof(a[0]))
+  for (j = 0; j < (int) LOOP_FMT_SIZE(loop_formats); j++) {
+    for (i = 0; i < 256; i++) {
+      xsnprintf(dev, sizeof(dev), loop_formats[j], i);
+      if (stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
+	somedev++;
+	fd = open(dev, O_RDONLY);
+	if (fd >= 0) {
+	  if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == 0)
+	    someloop++;		/* in use */
+	  else if (errno == ENXIO) {
+	    close(fd);
+	    return xstrdup(dev); /* probably free */
+	  }
+	  close(fd);
+	}
+	continue;		/* continue trying as long as devices exist */
+      }
+      break;
+    }
+  }
+
+  /* Nothing found. Why not? */
+  if ((procdev = fopen(PROC_DEVICES, "r")) != NULL) {
+    char line[100];
+    while (fgets(line, sizeof(line), procdev))
+      if (strstr(line, " loop\n")) {
+	loop_known = 1;
+	break;
+      }
+    fclose(procdev);
+    if (!loop_known)
+      loop_known = -1;
+  }
+
+  if (!somedev) {
+    dlog("Could not find any device /dev/loop#");
+  } else if (!someloop) {
+    if (loop_known == 1) {
+      dlog("Could not find any loop device.");
+      dlog("...Maybe /dev/loop# has a wrong major number?");
+    }
+    else if (loop_known == -1) {
+      dlog("Could not find any loop device, and, according to %s,", PROC_DEVICES);
+      dlog("...this kernel does not know about the loop device.");
+      dlog("... (If so, then recompile or `insmod loop.o'.)");
+    } else {
+      dlog("Could not find any loop device. Maybe this kernel does not know,");
+      dlog("...about the loop device (then recompile or `insmod loop.o'), or");
+      dlog("...maybe /dev/loop# has the wrong major number?");
+    }
+  } else {
+    dlog("Could not find any free loop device!");
+  }
+  return NULL;
+}
+
+
+/* returns 0 if OK, -1 otherwise */
+char *
+setup_loop_device(const char *file)
+{
+  struct loop_info loopinfo;
+  int fd, ffd, mode, err = -1;
+  char *device = find_unused_loop_device();
+
+  if (!device) {
+    dlog("no unused loop device");
+    goto out;
+  }
+
+  mode = O_RDWR | O_LARGEFILE;
+  if ((ffd = open(file, mode)) < 0) {
+    if (errno == EROFS) {
+      mode = O_RDONLY | O_LARGEFILE;
+      ffd = open(file, mode);
+    }
+    if (ffd < 0) {
+      dlog("%s: %m", file);
+      goto out;
+    }
+  }
+  if ((fd = open(device, mode)) < 0) {
+    dlog("%s: %m", device);
+    goto out_close;
+  }
+
+  memset(&loopinfo, 0, sizeof(loopinfo));
+  xstrlcpy(loopinfo.lo_name, file, LO_NAME_SIZE);
+  loopinfo.lo_offset = 0;
+
+  if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
+    dlog("ioctl: LOOP_SET_FD: %m");
+    goto out_close_all;
+  }
+  if (ioctl(fd, LOOP_SET_STATUS, &loopinfo) < 0) {
+    (void) ioctl(fd, LOOP_CLR_FD, 0);
+    dlog("ioctl: LOOP_SET_STATUS: %m");
+    goto out_close_all;
+  }
+
+  /* if gets here, all is OK */
+  err = 0;
+
+out_close_all:
+  close(fd);
+out_close:
+  close(ffd);
+out:
+
+  if (err) {
+    XFREE(device);
+    return NULL;
+  } else {
+    dlog("setup_loop_device(%s,%s): success", device, file);
+    return device;
+  }
+}
+
+
+int
+delete_loop_device(const char *device)
+{
+  int fd;
+
+  if ((fd = open(device, O_RDONLY)) < 0) {
+    dlog("delete_loop_device: can't delete device %s: %m", device);
+    return -1;
+  }
+  if (ioctl(fd, LOOP_CLR_FD, 0) < 0) {
+    dlog("ioctl: LOOP_CLR_FD: %m");
+    return -1;
+  }
+  close(fd);
+  dlog("delete_loop_device(%s): success", device);
+  return 0;
+}
+#endif /* HAVE_LOOP_DEVICE */
+
+
+/****************************************************************************/
diff --git a/conf/mount/mount_mach3.c b/conf/mount/mount_mach3.c
new file mode 100644
index 000000000000..5319a92e542f
--- /dev/null
+++ b/conf/mount/mount_mach3.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_mach3.c
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
+
+
+int
+mount_mach3(char *type, char *mnt, int flags, caddr_t mnt_data)
+{
+  int err = 0;
+  errno = 0;
+
+  if (syscall(SYS_vfsmount, type, mnt->mnt_dir, flags, mnt_data)) {
+    err = -1;
+    if (errno == ENODEV) {
+      /*
+       * might be an old kernel, need to try again
+       * with file type number instead of string
+       */
+      int typeno = 1;
+      plog(XLOG_ERROR, "%s: 1SYS_vfsmount: %m", mnt->mnt_dir);
+
+      if (STREQ(mnt->mnt_type, MOUNT_TYPE_UFS))
+        typeno = 0;
+      else if (STREQ(mnt->mnt_type, MOUNT_TYPE_NFS))
+        typeno = 1;
+      else
+	plog(XLOG_ERROR, "%s: type defaults to nfs...", mnt->mnt_dir);
+
+      plog(XLOG_ERROR, "%s: retry SYS_vfsmount %s %d", mnt->mnt_dir,
+	   mnt->mnt_type, typeno);
+      if (typeno >= 0) {
+        if (syscall(SYS_vfsmount, typeno, mnt->mnt_dir, flags, mnt_data)) {
+          plog(XLOG_ERROR, "%s: 2SYS_vfsmount: %m", mnt->mnt_dir);
+	} else {
+          err = 0;
+	}
+      }
+    }
+  }
+  return err;
+}
diff --git a/conf/mount/mount_freebsd3.c b/conf/mount/mount_stellix.c
index 5888ed949d30..53615d3fce91 100644
--- a/conf/mount/mount_freebsd3.c
+++ b/conf/mount/mount_stellix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-1998 Erez Zadok
+ * Copyright (c) 1997-2014 Erez Zadok
  * Copyright (c) 1990 Jan-Simon Pendry
  * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,14 +32,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      %W% (Berkeley) %G%
  *
- * $Id: mount_freebsd3.c,v 5.2.2.1 1992/02/09 15:10:08 jsp beta $
+ * File: am-utils/conf/mount/mount_stellix.c
  *
  */
 
 /*
- * FreeBSD 3.x (as of snapshot 3.0-980311-SNAP) Mount helper
+ * STELLIX Mount helper
  */
 
 #ifdef HAVE_CONFIG_H
@@ -52,17 +47,25 @@
 #include <am_defs.h>
 #include <amu.h>
 
+
 /*
  * Map from conventional mount arguments
- * to FreeBSD 3.0 style arguments.
+ * to STELLIX style arguments.
  */
 int
-mount_freebsd3(MTYPE_TYPE type, const char *dir, int flags, voidp data)
+mount_stellix(char *fsname, char *dir, int flags, int type, void *data)
 {
-  char const *namelist[] = INITMOUNTNAMES;
 
-  return mount(namelist[type],
-	       dir,
-	       flags,
-	       data);
+#ifdef DEBUG
+  dlog("stellix_mount: fsname %s, dir %s, type %d", fsname, dir, type);
+#endif /* DEBUG */
+
+  if (type == MOUNT_TYPE_NFS)
+    return mount(dir, dir, (MNT2_GEN_OPT_FSS | MNT2_GEN_OPT_NFS | flags),
+		 type, (caddr_t) data);
+
+  if (type == MOUNT_TYPE_UFS)
+    return mount(fsname, dir, (MNT2_GEN_OPT_FSS | flags), type);
+
+  return EINVAL;
 }
diff --git a/conf/mount/mount_svr4.c b/conf/mount/mount_svr4.c
new file mode 100644
index 000000000000..e139567bfb98
--- /dev/null
+++ b/conf/mount/mount_svr4.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 1997-2014 Erez Zadok
+ * Copyright (c) 1990 Jan-Simon Pendry
+ * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry at Imperial College, London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * File: am-utils/conf/mount/mount_svr4.c
+ *
+ */
+
+/*
+ * SVR4:
+ * Solaris 2.x (SunOS 5.x) and HPUX-11 Mount helper.
+ *      -Erez Zadok <ezk@cs.columbia.edu>
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+#include <am_defs.h>
+#include <amu.h>
+
+
+/*
+ * On Solaris 8 with in-kernel mount table, pass mount options to kernel to
+ * have them evaluated.  They will also show up in /etc/mnttab.
+ */
+#if defined(MNT2_GEN_OPT_OPTIONSTR) && defined(MAX_MNTOPT_STR)
+# define sys_mount(fsname, dir, flags, type, data, datasize) \
+	mount((fsname), (dir), (MNT2_GEN_OPT_OPTIONSTR | flags), (type), \
+	      (data), (datasize), mountopts, sizeof(mountopts))
+#else /* not defined(MNT2_GEN_OPT_OPTIONSTR) && defined(MAX_MNTOPT_STR) */
+# define sys_mount(fsname, dir, flags, type, data, datasize) \
+	mount((fsname), (dir), (flags), (type), (data), (datasize))
+#endif /* not defined(MNT2_GEN_OPT_OPTIONSTR) && defined(MAX_MNTOPT_STR) */
+
+
+/*
+ * Map from conventional mount arguments
+ * to Solaris 2.x (SunOS 5.x) style arguments.
+ */
+int
+mount_svr4(char *fsname, char *dir, int flags, MTYPE_TYPE type, caddr_t data, const char *optstr)
+{
+#if defined(MNT2_GEN_OPT_OPTIONSTR) && defined(MAX_MNTOPT_STR)
+  char mountopts[MAX_MNTOPT_STR];
+
+  /*
+   * Save a copy of the mount options.  The kernel will overwrite them with
+   * those it recognizes.
+   */
+  xstrlcpy(mountopts, optstr, MAX_MNTOPT_STR);
+#endif /* defined(MNT2_GEN_OPT_OPTIONSTR) && defined(MAX_MNTOPT_STR) */
+
+#if defined(MOUNT_TYPE_NFS3) && defined(MNTTAB_TYPE_NFS3)
+  if (STREQ(type, MOUNT_TYPE_NFS3)) {
+    return sys_mount(fsname, dir, (MNT2_GEN_OPT_DATA | flags),
+		     type, (char *) data, sizeof(nfs_args_t));
+  }
+#endif /* defined(MOUNT_TYPE_NFS3) && defined(MNTTAB_TYPE_NFS3) */
+
+#if defined(MOUNT_TYPE_NFS) && defined(MNTTAB_TYPE_NFS)
+  if (STREQ(type, MOUNT_TYPE_NFS)) {
+    return sys_mount(fsname, dir, (MNT2_GEN_OPT_DATA | flags),
+		     type, (char *) data, sizeof(nfs_args_t));
+  }
+#endif /* defined(MOUNT_TYPE_NFS) && defined(MNTTAB_TYPE_NFS) */
+
+#if defined(MOUNT_TYPE_AUTOFS) && defined(MNTTAB_TYPE_AUTOFS)
+  if (STREQ(type, MOUNT_TYPE_AUTOFS)) {
+    return sys_mount(fsname, dir, (MNT2_GEN_OPT_DATA | flags),
+		     type, (char *) data, sizeof(autofs_args_t));
+  }
+#endif /* defined(MOUNT_TYPE_AUTOFS) && defined(MNTTAB_TYPE_AUTOFS) */
+
+#if defined(MOUNT_TYPE_UFS) && defined(MNTTAB_TYPE_UFS)
+  if (STREQ(type, MOUNT_TYPE_UFS))
+    return sys_mount(fsname, dir, (MNT2_GEN_OPT_DATA | flags),
+		     type, (char *) data, sizeof(ufs_args_t));
+#endif /* defined(MOUNT_TYPE_UFS) && defined(MNTTAB_TYPE_UFS) */
+
+#if defined(MOUNT_TYPE_PCFS) && defined(MNTTAB_TYPE_PCFS)
+  if (STREQ(type, MOUNT_TYPE_PCFS))
+    return sys_mount(fsname, dir, (MNT2_GEN_OPT_DATA | flags),
+		     type, (char *) data, sizeof(pcfs_args_t));
+#endif /* defined(MOUNT_TYPE_PCFS) && defined(MNTTAB_TYPE_PCFS) */
+
+#if defined(MOUNT_TYPE_CDFS) && defined(MNTTAB_TYPE_CDFS)
+  /*
+   * HSFS on Solaris allows for 3 HSFSMNT_* flags to be passed
+   * as arguments to the mount().  These flags are bit fields in an
+   * integer, and that integer is passed as the "data" of this system
+   * call.  The flags are described in <sys/fs/hsfs_rrip.h>.  However,
+   * Solaris does not have an interface to these.  It does not define
+   * a structure hsfs_args or anything that one can figure out what
+   * arguments to pass to mount(2) for this type of filesystem.
+   * Therefore, until Sun does, no arguments are passed to this mount
+   * below.
+   * -Erez Zadok <ezk@cs.columbia.edu>.
+   */
+  if (STREQ(type, MOUNT_TYPE_CDFS))
+    return sys_mount(fsname, dir, (MNT2_GEN_OPT_FSS | flags),
+		     type, (char *) NULL, 0);
+#endif /* defined(MOUNT_TYPE_CDFS) && defined(MNTTAB_TYPE_CDFS) */
+
+#if defined(MOUNT_TYPE_LOFS) && defined(MNTTAB_TYPE_LOFS)
+  if (STREQ(type, MOUNT_TYPE_LOFS))
+    return sys_mount(fsname, dir, (MNT2_GEN_OPT_FSS | flags),
+		     type, (char *) NULL, 0);
+#endif /* defined(MOUNT_TYPE_LOFS) && defined(MNTTAB_TYPE_LOFS) */
+
+#ifdef HAVE_FS_CACHEFS
+# if defined(MOUNT_TYPE_CACHEFS) && defined(MNTTAB_TYPE_CACHEFS)
+  if (STREQ(type, MOUNT_TYPE_CACHEFS))
+    return sys_mount(fsname, dir, (MNT2_GEN_OPT_DATA | flags),
+		     type, (char *) data, sizeof(cachefs_args_t));
+# endif /* defined(MOUNT_TYPE_CACHEFS) && defined(MNTTAB_TYPE_CACHEFS) */
+#endif /*HAVE_FS_CACHEFS */
+
+#ifdef HAVE_FS_AUTOFS
+# if defined(MOUNT_TYPE_AUTOFS) && defined(MNTTAB_TYPE_AUTOFS)
+  if (STREQ(type, MOUNT_TYPE_AUTOFS))
+    return sys_mount(fsname, dir, (MNT2_GEN_OPT_DATA | flags),
+		     type, (char *) data, sizeof(autofs_args_t));
+# endif /* defined(MOUNT_TYPE_AUTOFS) && defined(MNTTAB_TYPE_AUTOFS) */
+#endif /* HAVE_FS_AUTOFS */
+
+  return EINVAL;
+}