diff options
| author | Steve Dickson <steved@redhat.com> | 2017-06-13 12:00:39 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2017-06-21 12:15:00 -0400 |
| commit | 62a4d95854e5cda4b772fa132cbd16c4429412c8 (patch) | |
| tree | 8992f83a9eff02ea3cf6ba3ae4208a1f2a9d5c9b | |
| parent | 9569237ba50c5857e04bc36c9b3250c570bfbef2 (diff) | |
| download | nfs-utils-62a4d95854e5cda4b772fa132cbd16c4429412c8.tar.gz nfs-utils-62a4d95854e5cda4b772fa132cbd16c4429412c8.tar.xz nfs-utils-62a4d95854e5cda4b772fa132cbd16c4429412c8.zip | |
mount.nfs: Use default minor version when -t nfs4 is specified
When the nfs4 filesystem specified, the default major
and minor versions should be used.
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/mount/stropts.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index c0266e5..fbea6fb 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -73,6 +73,13 @@ #define NFS_DEF_BG_TIMEOUT_MINUTES (10000u) #endif +#ifndef NFS_DEFAULT_MAJOR +#define NFS_DEFAULT_MAJOR 4 +#endif +#ifndef NFS_DEFAULT_MINOR +#define NFS_DEFAULT_MINOR 2 +#endif + extern int nfs_mount_data_version; extern char *progname; extern int verbose; @@ -124,8 +131,8 @@ static void nfs_default_version(struct nfsmount_info *mi) } #endif /* MOUNT_CONFIG */ - mi->version.major = 4; - mi->version.minor = 2; + mi->version.major = NFS_DEFAULT_MAJOR; + mi->version.minor = NFS_DEFAULT_MINOR; } /* @@ -316,7 +323,9 @@ static int nfs_set_version(struct nfsmount_info *mi) return 0; if (strncmp(mi->type, "nfs4", 4) == 0) { - mi->version.major = 4; + /* Set to default values */ + mi->version.major = NFS_DEFAULT_MAJOR; + mi->version.minor = NFS_DEFAULT_MINOR; mi->version.v_mode = V_GENERAL; } /* |