mount.nfs: Always preset nfs_mount_version

[nfs-utils.git] / utils / mount / mount.c

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 0149d6bec9dfd5d4ea8c3590cc25c9b91375902c..96b56973faeeb3731dcd98d74a51d216c5378fcf 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/mount.h>
+#include <sys/utsname.h>
 #include <getopt.h>
 #include <mntent.h>
 #include <pwd.h>
@@ -40,8 +41,10 @@
 #include "nfs4_mount.h"
 #include "nfsumount.h"
 #include "mount.h"
+#include "error.h"
 
 char *progname;
+int nfs_mount_data_version;
 int nomtab;
 int verbose;
 int sloppy;
@@ -127,6 +130,51 @@ static const struct opt_map opt_map[] = {
   { NULL,      0, 0, 0         }
 };
 
+#define MAKE_VERSION(p,q,r)    (65536 * (p) + 256 * (q) + (r))
+
+int linux_version_code(void)
+{
+       struct utsname my_utsname;
+       int p, q, r;
+
+       if (uname(&my_utsname) == 0) {
+               p = atoi(strtok(my_utsname.release, "."));
+               q = atoi(strtok(NULL, "."));
+               r = atoi(strtok(NULL, "."));
+               return MAKE_VERSION(p,q,r);
+       }
+       return 0;
+}
+
+/*
+ * Choose the version of the nfs_mount_data structure that is appropriate
+ * for the kernel that is doing the mount.
+ *
+ * NFS_MOUNT_VERSION:          maximum version supported by these sources
+ * nfs_mount_data_version:     maximum version supported by the running kernel
+ */
+static void discover_nfs_mount_data_version(void)
+{
+       int kernel_version = linux_version_code();
+
+       if (kernel_version) {
+               if (kernel_version < MAKE_VERSION(2, 1, 32))
+                       nfs_mount_data_version = 1;
+               else if (kernel_version < MAKE_VERSION(2, 2, 18))
+                       nfs_mount_data_version = 3;
+               else if (kernel_version < MAKE_VERSION(2, 3, 0))
+                       nfs_mount_data_version = 4;
+               else if (kernel_version < MAKE_VERSION(2, 3, 99))
+                       nfs_mount_data_version = 3;
+               else if (kernel_version < MAKE_VERSION(2, 6, 3))
+                       nfs_mount_data_version = 4;
+               else
+                       nfs_mount_data_version = 6;
+       }
+       if (nfs_mount_data_version > NFS_MOUNT_VERSION)
+               nfs_mount_data_version = NFS_MOUNT_VERSION;
+}
+
 /* Try to build a canonical options string.  */
 static char * fix_opts_string (int flags, const char *extra_opts) {
        const struct opt_map *om;
@@ -282,44 +330,20 @@ static void parse_opts (const char *options, int *flags, char **extra_opts)
        }
 }
 
-static void mount_error(char *mntpnt, char *node)
-{
-       switch(errno) {
-               case ENOTDIR:
-                       fprintf(stderr, "%s: mount point %s is not a directory\n", 
-                               progname, mntpnt);
-                       break;
-               case EBUSY:
-                       fprintf(stderr, "%s: %s is already mounted or busy\n", 
-                               progname, mntpnt);
-                       break;
-               case ENOENT:
-                       if (node) {
-                               fprintf(stderr, "%s: %s failed, reason given by server: %s\n",
-                                       progname, node, strerror(errno));
-                       } else
-                               fprintf(stderr, "%s: mount point %s does not exist\n", 
-                                       progname, mntpnt);
-                       break;
-               default:
-                       fprintf(stderr, "%s: %s\n", progname, strerror(errno));
-       }
-}
 static int chk_mountpoint(char *mount_point)
 {
        struct stat sb;
 
        if (stat(mount_point, &sb) < 0){
-               mount_error(mount_point, NULL);
+               mount_error(NULL, mount_point, errno);
                return 1;
        }
        if (S_ISDIR(sb.st_mode) == 0){
-               errno = ENOTDIR;
-               mount_error(mount_point, NULL);
+               mount_error(NULL, mount_point, ENOTDIR);
                return 1;
        }
        if (access(mount_point, X_OK) < 0) {
-               mount_error(mount_point, NULL);
+               mount_error(NULL, mount_point, errno);
                return 1;
        }
 
@@ -385,6 +409,8 @@ int main(int argc, char *argv[])
 
        progname = basename(argv[0]);
 
+       discover_nfs_mount_data_version();
+
        if(!strncmp(progname, "umount", strlen("umount"))) {
                if(argc < 2) {
                        umount_usage();
@@ -529,7 +555,7 @@ int main(int argc, char *argv[])
                                           mount_opts);
 
                if (mnt_err) {
-                       mount_error(mount_point, spec);
+                       mount_error(spec, mount_point, errno);
                        exit(EX_FAIL);
                }
        }