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

[Steve Dickson <SteveD@redhat.com>]

Again, sorry for the delayed response... 

On 10/27/2009 04:20 PM, Chuck Lever wrote:
> Hi-
> 
> On Oct 27, 2009, at 4:02 PM, 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);
> 
> 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.

> I've been prefixing function names with "nfs_"
> for most global functions, to make debugging easier.
Change made.

>> +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 */
> 
> 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...

> 
>> +
>> /*
>>  * 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;
>> }
>> -
> 
> Whitespace nit: other function declarations in this source file are
> separated by a single blank line.
Fixed.

steved.