0,
};
+inline const unsigned int *set_default_proto(void);
+#ifdef MOUNT_CONFIG
+inline const unsigned int *set_default_proto()
+{
+ extern unsigned long config_default_proto;
+ /*
+ * If the default proto has been set and
+ * its not TCP, start with UDP
+ */
+ if (config_default_proto && config_default_proto != IPPROTO_TCP)
+ return probe_udp_first;
+
+ return probe_tcp_first;
+}
+#else
+inline const unsigned int *set_default_proto()
+{
+ return probe_tcp_first;
+}
+#endif /* MOUNT_CONFIG */
+
static int nfs_lookup(const char *hostname, const sa_family_t family,
struct sockaddr *sap, socklen_t *salen)
{
nfs_clear_rpc_createerr();
return 1;
}
-
/*
* Probe a server's NFS service to determine which versions and
* transport protocols are supported.
return 1;
if (nfs_mount_data_version >= 4) {
- const unsigned int *probe_proto = probe_tcp_first;
+ const unsigned int *probe_proto;
- /*
- * If the default proto has been set and
- * its not TCP, start with UDP
- */
- if (config_default_proto && config_default_proto != IPPROTO_TCP)
- probe_proto = probe_udp_first;
+ probe_proto = set_default_proto();
return nfs_probe_port(sap, salen, pmap,
probe_nfs3_first, probe_proto);
child; /* forked bg child? */
};
+inline void set_default_version(struct nfsmount_info *mi);
+#ifdef MOUNT_CONFIG
+inline void set_default_version(struct nfsmount_info *mi)
+{
+ extern unsigned long config_default_vers;
+ /*
+ * Use the default value set in the config file when
+ * the version has not been explicitly set.
+ */
+ if (mi->version == 0 && config_default_vers) {
+ if (config_default_vers < 4)
+ mi->version = config_default_vers;
+ }
+}
+#else
+inline void set_default_version(struct nfsmount_info *mi) {}
+#endif /* MOUNT_CONFIG */
+
/*
* Obtain a retry timeout value based on the value of the "retry=" option.
*
return 0;
return 1;
}
-
/*
* Set up mandatory non-version specific NFS mount options.
*
if (option && strcmp(option, "rdma") == 0)
mi->version = 3;
}
+
/*
- * Use the default value set in the config file when
- * the version has not been explicitly set.
+ * If enabled, see if the default version was
+ * set in the config file
*/
- if (mi->version == 0 && config_default_vers) {
- if (config_default_vers < 4)
- mi->version = config_default_vers;
- }
+ set_default_version(mi);
if (!nfs_append_sloppy_option(mi->options))
return 0;