Re: [PATCH] Fixed compile errors when the mount config file is not enabled

[Steve Dickson <SteveD@redhat.com>]

Sorry for the delayed response... 

On 10/28/2009 08:20 AM, Peter Staubach wrote:
> Steve Dickson wrote:
>> Author: Steve Dickson <steved@redhat.com>
>> 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.
>>     
>>     Signed-off-by: Steve Dickson <steved@redhat.com>
>>
>> diff --git a/support/include/conffile.h b/support/include/conffile.h
>> index fe23ec2..ce7aa21 100644
>> --- a/support/include/conffile.h
>> +++ b/support/include/conffile.h
>> @@ -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_ */
>> diff --git a/utils/mount/network.c b/utils/mount/network.c
>> index e651167..d4ecbc9 100644
>> --- a/utils/mount/network.c
>> +++ b/utils/mount/network.c
>> @@ -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;
>> +
> 
> 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.