Add 2 more members on linux nfs_args, pseudoflavor and context. Explicitly

initialize them to 0, otherwise on 2.6.26.x mount returns EINVAL if
context is not 0.

diff --git a/conf/mount/mount_linux.c b/conf/mount/mount_linux.c
index 827f9e767071ecd0320ff83bc54b385832f791fd..961f3123cd4d0614f18da3e69ba7e5b004bab7f6 100644 (file)
--- a/conf/mount/mount_linux.c
+++ b/conf/mount/mount_linux.c
@@ -326,6 +326,14 @@ mount_linux_nfs(MTYPE_TYPE type, mntent_t *mnt, int flags, caddr_t data)
   mnt_data->namlen = NAME_MAX;         /* 256 bytes */
 #endif /* HAVE_NFS_ARGS_T_NAMELEN */
 
+#ifdef HAVE_NFS_ARGS_T_PSEUDOFLAVOR
+  mnt_data->pseudoflavor = 0;
+#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");

diff --git a/conf/nfs_prot/nfs_prot_linux.h b/conf/nfs_prot/nfs_prot_linux.h
index a27292f559a14d7bd4159797a076277dd555c9f4..73d35f4d16e385cca0801048f11ddcc449d74de2 100644 (file)
--- a/conf/nfs_prot/nfs_prot_linux.h
+++ b/conf/nfs_prot/nfs_prot_linux.h
@@ -259,6 +259,8 @@ struct nfs_args {
   int                  namlen;         /* 2 */
   unsigned int         bsize;          /* 3 */
   struct nfs3_fh       root;           /* 4 */
+  int                  pseudoflavor;   /* 5 */
+  char                 context[256 + 1];/* 6 */
 };
 typedef struct nfs_args nfs_args_t;
 

diff --git a/configure.in b/configure.in
index af09c8302b9b4ac97e2b755fa6807edeca78db71..ddabce3ba7f6e63956bfb26c84fb2c65a1628fb8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.133 $)
+AC_REVISION($Revision: 1.134 $)
 AC_COPYRIGHT([Copyright (c) 1997-2007 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -965,6 +965,8 @@ AMU_CHECK_FIELD(nfs_args_t.pathconf)
 AMU_CHECK_FIELD(nfs_args_t.proto)
 AMU_CHECK_FIELD(nfs_args_t.sotype)
 AMU_CHECK_FIELD(nfs_args_t.version)
+AMU_CHECK_FIELD(nfs_args_t.pseudoflavor)
+AMU_CHECK_FIELD(nfs_args_t.context)
 AMU_CHECK_FIELD(struct ifreq.ifr_addr)
 AMU_CHECK_FIELD(struct ifaddrs.ifa_next)
 AMU_CHECK_FIELD(struct sockaddr.sa_len)