the defaults that were a result of the code review.
Signed-off-by: Steve Dickson <steved@redhat.com>
-inline const unsigned int *set_default_proto(void);
+static const unsigned int *nfs_default_proto(void);
-inline const unsigned int *set_default_proto()
+static const unsigned int *nfs_default_proto()
{
extern unsigned long config_default_proto;
/*
{
extern unsigned long config_default_proto;
/*
return probe_tcp_first;
}
#else
return probe_tcp_first;
}
#else
-inline const unsigned int *set_default_proto()
+static const unsigned int *nfs_default_proto()
{
return probe_tcp_first;
}
{
return probe_tcp_first;
}
if (nfs_mount_data_version >= 4) {
const unsigned int *probe_proto;
if (nfs_mount_data_version >= 4) {
const unsigned int *probe_proto;
- probe_proto = set_default_proto();
+ probe_proto = nfs_default_proto();
return nfs_probe_port(sap, salen, pmap,
probe_nfs3_first, probe_proto);
return nfs_probe_port(sap, salen, pmap,
probe_nfs3_first, probe_proto);
child; /* forked bg child? */
};
child; /* forked bg child? */
};
-inline void set_default_version(struct nfsmount_info *mi);
-inline void set_default_version(struct nfsmount_info *mi)
+static void nfs_default_version(struct nfsmount_info *mi);
+
+static void nfs_default_version(struct nfsmount_info *mi)
{
extern unsigned long config_default_vers;
/*
{
extern unsigned long config_default_vers;
/*
-inline void set_default_version(struct nfsmount_info *mi) {}
+inline void nfs_default_version(struct nfsmount_info *mi) {}
#endif /* MOUNT_CONFIG */
/*
#endif /* MOUNT_CONFIG */
/*
/*
* Set up mandatory non-version specific NFS mount options.
*
/*
* Set up mandatory non-version specific NFS mount options.
*
* If enabled, see if the default version was
* set in the config file
*/
* If enabled, see if the default version was
* set in the config file
*/
- set_default_version(mi);
+ nfs_default_version(mi);
if (!nfs_append_sloppy_option(mi->options))
return 0;
if (!nfs_append_sloppy_option(mi->options))
return 0;