Remove some incorrect version matching code.

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 7d58ef67ce36a023969d53d8f82769e9ec2e0c1a..0edcc1a2565f444263376ced71f127d4e2e07b9c 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -386,25 +386,31 @@ int main(int argc, char *argv[])
        else if (!strcmp(progname, "mount.nfs")) {
                int need_statd = 0;
                mnt_err = nfsmount(spec, mount_point, &flags,
-                                  &extra_opts, &mount_opts, &nfs_mount_vers,
+                                  &extra_opts, &mount_opts,
                                   0, &need_statd);
                if (!mnt_err && !fake && need_statd)
                        start_statd();
        }
 
-       if (!mnt_err && !fake) {
-               mnt_err = do_mount_syscall(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
-               
-               if(mnt_err) {
-                       mount_error(mount_point);
-                       exit(-1);
-               }
+       if (fake)
+               return 0;
+       if (mnt_err)
+               exit(EX_FAIL);
 
-               if(!nomtab)
-                       add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs",
-                                flags, extra_opts, 0, 0);
+       mnt_err = do_mount_syscall(spec, mount_point,
+                                  nfs_mount_vers == 4 ? "nfs4" : "nfs",
+                                  flags, mount_opts);
+               
+       if (mnt_err) {
+               mount_error(mount_point);
+               exit(EX_FAIL);
        }
 
+       if (!nomtab)
+               add_mtab(spec, mount_point,
+                        nfs_mount_vers == 4 ? "nfs4" : "nfs",
+                        flags, extra_opts, 0, 0);
+
        return 0;
 }