Merge / rebase error at some point. I'll submit a fix.
Daniel
On 11/27/2016 01:16 AM, Malahal Naineni wrote:
> I am not sure about the exact error that the checkpatch is complaining
> here. Maybe it is getting confused with our conditionals! About the
> _USE_NLM, it is done incorrectly the way I understand it. We should
> define P_NLM only if _USE_NLM is defined. Then the current code will
> run to compilation issues and fixing them would get the code right!
>
> If the intention is to remove the feature and NOT the code size, then
> this could just be a config parameter (enable_NLM = [true]/false)
> which will make the code easier to read. Does anyone know the original
> intention of _USE_NLM?
>
> Regards, Malahal.
>
> On Sun, Nov 27, 2016 at 5:44 AM, William Allen Simpson
> <william.allen.simp...@gmail.com> wrote:
>> Should the #ifdef and #endif be one line higher? That lets me commit.
>>
>> Or is this just new commit hook code-zanyism?
>>
>> The error is for my test code; there are some defines to try to make
>> things fit in 80 columns. See the current code listing below....
>>
>> The current code will no longer commit.
>>
>> ===
>>
>> ERROR: trailing statements should be on next line
>> #216: FILE: src/MainNFSD/nfs_rpc_dispatcher_thread.c:1765:
>> + } else if (req->rq_msg.cb_prog == NFS_pcpp[P_MNT]
>> [...]
>> + && ((NFS_pcpco & CORE_OPTION_NFSV3) != 0)) {
>>
>>
>> ===
>>
>> } else if (req->rq_prog == nfs_param.core_param.program[P_NLM]
>> #ifdef _USE_NLM
>> && ((nfs_param.core_param.core_options &
>> CORE_OPTION_NFSV3)
>> != 0)) {
>> if (req->rq_vers == NLM4_VERS) {
>> if (req->rq_proc <= NLMPROC4_FREE_ALL)
>> return true;
>> else
>> goto noproc_err;
>> } else {
>> lo_vers = NLM4_VERS;
>> hi_vers = NLM4_VERS;
>> goto progvers_err;
>> }
>> } else if (req->rq_prog == nfs_param.core_param.program[P_MNT]
>> #endif /* _USE_NLM */
>> && ((nfs_param.core_param.core_options &
>> CORE_OPTION_NFSV3)
>> != 0)) {
>> /* Some clients may use the wrong mount version to umount,
>> so
>> * always allow umount, otherwise only allow request if the
>> * appropriate mount version is enabled. Also need to allow
>> * dump and export, so just disallow mount if version not
>> * supported.
>> */
>>
>> ------------------------------------------------------------------------------
>> _______________________________________________
>> Nfs-ganesha-devel mailing list
>> Nfs-ganesha-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Nfs-ganesha-devel mailing list
> Nfs-ganesha-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel
>
------------------------------------------------------------------------------
_______________________________________________
Nfs-ganesha-devel mailing list
Nfs-ganesha-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel
