summaryrefslogtreecommitdiffstats
path: root/utils/mount/configfile.c
diff options
context:
space:
mode:
authorBenjamin Coddington <bcodding@redhat.com>2014-12-08 15:34:51 -0500
committerSteve Dickson <steved@redhat.com>2015-01-23 14:08:18 -0500
commit5bea22e33b7a0f1d2348100cbefbe45dd49cb23d (patch)
tree9284fc0ce002d612b2fd6c870dfbeedd0f0f92c1 /utils/mount/configfile.c
parent0ffc25463b3e6c5a87c14f782a7c1d19b13d318f (diff)
downloadnfs-utils-5bea22e33b7a0f1d2348100cbefbe45dd49cb23d.tar.gz
nfs-utils-5bea22e33b7a0f1d2348100cbefbe45dd49cb23d.tar.xz
nfs-utils-5bea22e33b7a0f1d2348100cbefbe45dd49cb23d.zip
mount.nfs: Add struct nfs_version and generalize version parsing
The nfs_version needs to carry major, minor, and basic mode information to allow decisions to be made to override, discard, or negotiate various versions. Update nfs_nfs_version() to work against this struct and set the various modes. This change also makes nfs_nfs_version() parse properly for future version number additions. The general rules for version.v_mode are - not set V_DEFAULT - single digit => 4 V_GENERAL - single digit < 4 V_SPECIFIC - decimal included V_SPECIFIC - miss all others V_PARSE_ERR Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/mount/configfile.c')
-rw-r--r--utils/mount/configfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c
index 39d3741..a0072f1 100644
--- a/utils/mount/configfile.c
+++ b/utils/mount/configfile.c
@@ -258,7 +258,7 @@ check_vers(char *mopt, char *field)
return 0;
}
-unsigned long config_default_vers;
+struct nfs_version config_default_vers;
unsigned long config_default_proto;
extern sa_family_t config_default_family;