Fixed compile errors when the mount config file is not enabled
Subsystems (2)
PATCH 1/1 Fixed compile errors when the mount config file is not enabled
Author: Steve Dickson <[email protected]> Date: Tue Oct 27 15:47:27 2009 -0400
Added wrappers around the setting of default values from the config file which will be compiled out when the config file is not enabled.
support/include/conffile.h +0 -5
@@ -76,10 +76,5 @@ static inline void upper2lower(char *str) *str++ = c; } -/* -* Default Mount options -*/ -extern unsigned long config_default_vers; -extern unsigned long config_default_proto;#endif /* _CONFFILE_H_ */
utils/mount/network.c +23 -8
@@ -172,6 +172,27 @@ static const unsigned long probe_mnt3_first[] = { 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) {
@@ -590,7 +611,6 @@ out_ok:nfs_clear_rpc_createerr ();return 1 ; } -/* * Probe a server's NFS service to determine which versions and * transport protocols are supported.
@@ -611,14 +631,9 @@ static int nfs_probe_nfsport(const struct sockaddr *sap, const socklen_t salen,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);
utils/mount/stropts.c +22 -7
@@ -93,6 +93,24 @@ struct nfsmount_info { 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. *
@@ -258,7 +276,6 @@ static int nfs_append_sloppy_option(struct mount_options *options)return 0 ;return 1 ; } -/* * Set up mandatory non-version specific NFS mount options. *
@@ -284,14 +301,12 @@ static int nfs_validate_options(struct nfsmount_info *mi)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 ;
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi-
Quoted 29 lines · Steve Dickson
Author: Steve Dickson <[email protected]> Date: Tue Oct 27 15:47:27 2009 -0400Added wrappers around the setting of default values from the config file which will be compiled out when the config file is not enabled.
Signed-off-by Steve Dickson <[email protected]>support/include/conffile.h +0
-5@@ -76,10 +76,5 @@ static inline void upper2lower(char *str) *str++ = c; } -/* -* Default Mount options -*/ -extern unsigned long config_default_vers; -extern unsigned long config_default_proto;#endif /* _CONFFILE_H_ */ utils/mount/network.c +0
-0
utils/mount/network.c static const unsigned long probe_mnt3_first[] = { · line 175
Quoted 4 lines
utils/mount/network.c +1
-0@@ -172,6 +172,27 @@ static const unsigned long probe_mnt3_first[] = { 0, }; +inline const unsigned int *set_default_proto (void );
The "inline" directives are visual clutter, really... shouldn't this be "static" instead (which in most normal cases implies "inline")? Otherwise, you also clutter up the linker's symbol name space with these generic function names. I've been prefixing function names with "nfs_" for most global functions, to make debugging easier.
Why is a forward declaration needed for this function?
Quoted 64 lines
utils/mount/network.c +22
-8+#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) {@@ -590,7 +611,6 @@ out_ok:nfs_clear_rpc_createerr ();return 1 ; } -/* * Probe a server's NFS service to determine which versions and * transport protocols are supported. @@ -611,14 +631,9 @@ static int nfs_probe_nfsport(const struct sockaddr *sap, const socklen_t salen, 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);utils/mount/stropts.c +7
-0@@ -93,6 +93,24 @@ struct nfsmount_info { 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
utils/mount/stropts.c struct nfsmount_info { · line 112
Quoted 10 lines
utils/mount/stropts.c +10
-0+* 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 */
Er. See recent patch I posted that created a nfs_set_version() function, that is useful for a variety of purposes. Could we build on that instead?
utils/mount/stropts.c static int nfs_append_sloppy_option(struct · line 262
Quoted 11 lines
utils/mount/stropts.c +1
-0+/* * Obtain a retry timeout value based on the value of the "retry=" option.
*utils/mount/stropts.c +0
-1@@ -258,7 +276,6 @@ static int nfs_append_sloppy_option(struct mount_options *options)return 0 ;return 1 ; } -
Whitespace nit: other function declarations in this source file are separated by a single blank line.
Quoted 23 lines
utils/mount/stropts.c +0
-0/* * Set up mandatory non-version specific NFS mount options. *
utils/mount/stropts.c +4
-6@@ -284,14 +301,12 @@ static int nfs_validate_options(struct nfsmount_info *mi)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;
Quoted 4 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Again, sorry for the delayed response...
Quoted 36 lines · Chuck Lever
Hi-
Quoted 32 lines · Steve Dickson
Author: Steve Dickson <[email protected]> Date: Tue Oct 27 15:47:27 2009 -0400Added wrappers around the setting of default values from the config file which will be compiled out when the config file is not enabled.
Signed-off-by Steve Dickson <[email protected]>support/include/conffile.h +0
-5@@ -76,10 +76,5 @@ static inline void upper2lower(char *str) *str++ = c; } -/* -* Default Mount options -*/ -extern unsigned long config_default_vers; -extern unsigned long config_default_proto;#endif /* _CONFFILE_H_ */ utils/mount/network.c +0
-0@@ -172,6 +172,27 @@ static const unsigned long probe_mnt3_first[] = { 0, };
Quoted 6 lines
utils/mount/network.c static const unsigned long probe_mnt3_first[] = { · line 175
Quoted 1 line
utils/mount/network.c +1
-0+inline const unsigned int *set_default_proto (void );The "inline" directives are visual clutter, really... shouldn't this be "static" instead (which in most normal cases implies "inline")? Otherwise, you also clutter up the linker's symbol name space with these generic function names.
True, static routines are eaiser to debug than inline.
Quoted 2 lines
I've been prefixing function names with "
nfs_" for most global functions, to make debugging easier.
Change made.
Quoted 13 lines
Quoted 13 lines
utils/mount/network.c +13
-0+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; + }
Quoted 8 lines
utils/mount/network.c static const unsigned long probe_mnt3_first[] = { · line 192
Quoted 4 lines
utils/mount/network.c +4
-0+} +#else +inline void set_default_version (struct nfsmount_info *mi) {} +#endif /* MOUNT_CONFIG */ Er. See recent patch I posted that created a
nfs_set_version()function, that is useful for a variety of purposes. Could we build on that instead?
I'll do the merge when I get there...
Quoted 15 lines
utils/mount/network.c static int nfs_append_sloppy_option(struct · line 262
Quoted 12 lines
utils/mount/network.c +1
-0+/* * Obtain a retry timeout value based on the value of the "retry=" option.
*utils/mount/network.c +0
-1@@ -258,7 +276,6 @@ static int nfs_append_sloppy_option(struct mount_options *options)return 0 ;return 1 ; } -Whitespace nit: other function declarations in this source file are separated by a single blank line.
Fixed.
steved.
Quoted 36 lines · Chuck Lever
Hi-
Quoted 32 lines · Steve Dickson
Author: Steve Dickson <[email protected]> Date: Tue Oct 27 15:47:27 2009 -0400Added wrappers around the setting of default values from the config file which will be compiled out when the config file is not enabled.
Signed-off-by Steve Dickson <[email protected]>support/include/conffile.h +0
-5@@ -76,10 +76,5 @@ static inline void upper2lower(char *str) *str++ = c; } -/* -* Default Mount options -*/ -extern unsigned long config_default_vers; -extern unsigned long config_default_proto;#endif /* _CONFFILE_H_ */ utils/mount/network.c +0
-0@@ -172,6 +172,27 @@ static const unsigned long probe_mnt3_first[] = { 0, };
Quoted 7 lines
utils/mount/network.c static const unsigned long probe_mnt3_first[] = { · line 175
Quoted 1 line
utils/mount/network.c +1
-0+inline const unsigned int *set_default_proto (void );The "inline" directives are visual clutter, really... shouldn't this be "static" instead (which in most normal cases implies "inline")? Otherwise, you also clutter up the linker's symbol name space with these generic function names. I've been prefixing function names with "
nfs_" for most global functions, to make debugging easier.
I made these changes a while ago... I guess I forgot to mention it... thanks of the input!
steved.
Quoted 34 lines · Steve Dickson
Author: Steve Dickson <[email protected]> Date: Tue Oct 27 15:47:27 2009 -0400Added wrappers around the setting of default values from the config file which will be compiled out when the config file is not enabled.
Signed-off-by Steve Dickson <[email protected]>support/include/conffile.h +0
-5@@ -76,10 +76,5 @@ static inline void upper2lower(char *str) *str++ = c; } -/* -* Default Mount options -*/ -extern unsigned long config_default_vers; -extern unsigned long config_default_proto;#endif /* _CONFFILE_H_ */ utils/mount/network.c +2
-0@@ -172,6 +172,27 @@ static const unsigned long probe_mnt3_first[] = { 0, }; +inline const unsigned int *set_default_proto (void ); +#ifdef MOUNT_CONFIG
utils/mount/network.c static const unsigned long probe_mnt3_first[] = { · line 186
Quoted 10 lines
utils/mount/network.c +10
-0+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; +
Shouldn't there be something to account for NFSv4 only being supported over TCP and not UDP by specification? The Linux server still supports NFSv4 over UDP, although it is not supposed to and should not. Even if the default transport is set to UDP, NFSv4 should always be mounted over TCP.
Thanx... ps
Quoted 97 lines
utils/mount/network.c +11
-8+ 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) {@@ -590,7 +611,6 @@ out_ok:nfs_clear_rpc_createerr ();return 1 ; } -/* * Probe a server's NFS service to determine which versions and * transport protocols are supported. @@ -611,14 +631,9 @@ static int nfs_probe_nfsport(const struct sockaddr *sap, const socklen_t salen,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);utils/mount/stropts.c +22
-8@@ -93,6 +93,24 @@ struct nfsmount_info { 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. * @@ -258,7 +276,6 @@ static int nfs_append_sloppy_option(struct mount_options *options)return 0 ;return 1 ; } -/* * Set up mandatory non-version specific NFS mount options. * @@ -284,14 +301,12 @@ static int nfs_validate_options(struct nfsmount_info *mi)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 ; --To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Sorry for the delayed response...
Quoted 43 lines · Peter Staubach
Quoted 42 lines · Steve Dickson
Author: Steve Dickson <[email protected]> Date: Tue Oct 27 15:47:27 2009 -0400Added wrappers around the setting of default values from the config file which will be compiled out when the config file is not enabled.
Signed-off-by Steve Dickson <[email protected]>support/include/conffile.h +0
-5@@ -76,10 +76,5 @@ static inline void upper2lower(char *str) *str++ = c; } -/* -* Default Mount options -*/ -extern unsigned long config_default_vers; -extern unsigned long config_default_proto;#endif /* _CONFFILE_H_ */ utils/mount/network.c +10
-0@@ -172,6 +172,27 @@ static const unsigned long probe_mnt3_first[] = { 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 )
Quoted 8 lines
utils/mount/network.c static const unsigned long probe_mnt3_first[] = { · line 186
Quoted 2 lines
utils/mount/network.c +2
-0+return probe_udp_first; +Shouldn't there be something to account for NFSv4 only being supported over TCP and not UDP by specification? The Linux server still supports NFSv4 over UDP, although it is not supposed to and should not. Even if the default transport is set to UDP, NFSv4 should always be mounted over TCP.
set_default_proto() is only called from nfs_probe_nfsport() which figures out what protocol the server supports. With v4 mounts, that type of probing is not done. Just TCP is used.
steved.