diff options
| author | Steve Dickson <steved@redhat.com> | 2017-06-13 13:24:29 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2017-06-13 13:24:29 -0400 |
| commit | cf68256e63a2926e2fa5cf8bd1f10d19011c4459 (patch) | |
| tree | f449e6579a4f75557d9adb5e289d2a926d1c38e2 | |
| parent | f07b7d1120a183316ec671117313147a5f2af5c7 (diff) | |
| download | nfs-utils-nfs4.tar.gz | |
mount.nfs: Use default minor version when -o v4 is specifiednfs4
When v4 is specified on the command line the
default minor version needs to be used.
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/mount/stropts.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index fbea6fb..9330d42 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -119,14 +119,22 @@ static void nfs_default_version(struct nfsmount_info *mi) if (mi->version.v_mode == V_DEFAULT && config_default_vers.v_mode != V_DEFAULT) { mi->version.major = config_default_vers.major; - mi->version.minor = config_default_vers.minor; + if (config_default_vers.minor) + mi->version.minor = config_default_vers.minor; + else if (!mi->version.minor) + mi->version.minor = NFS_DEFAULT_MINOR; return; } if (mi->version.v_mode == V_GENERAL) { if (config_default_vers.v_mode != V_DEFAULT && - mi->version.major == config_default_vers.major) - mi->version.minor = config_default_vers.minor; + mi->version.major == config_default_vers.major) { + if (config_default_vers.minor) + mi->version.minor = config_default_vers.minor; + else if (!mi->version.minor) + mi->version.minor = NFS_DEFAULT_MINOR; + } else if (!mi->version.minor) + mi->version.minor = NFS_DEFAULT_MINOR; return; } @@ -741,13 +749,9 @@ static int nfs_do_mount_v4(struct nfsmount_info *mi, } if (mi->version.v_mode != V_SPECIFIC) { - if (mi->version.v_mode == V_GENERAL) - snprintf(version_opt, sizeof(version_opt) - 1, - "vers=%lu", mi->version.major); - else - snprintf(version_opt, sizeof(version_opt) - 1, - "vers=%lu.%lu", mi->version.major, - mi->version.minor); + snprintf(version_opt, sizeof(version_opt) - 1, + "vers=%lu.%lu", mi->version.major, + mi->version.minor); if (po_append(options, version_opt) == PO_FAILED) { errno = EINVAL; |