On Mon, May 22, 2017 at 6:42 AM, Daniel Jurgens <danielj@xxxxxxxxxxxx> wrote: > On 5/21/2017 7:13 PM, James Morris wrote: >> On Fri, 19 May 2017, Dan Jurgens wrote: >> >>> security/security.c | 385 ++++++++++++++++++++++ >> This looks wrong -- merge problem? > > Yes, it was a merge problem. I added back the per field initialization of the security head hooks. Paul stripped this (and the same problem in patch 0004) himself before merging. > >> >> >>> + if (pps->alt.state != IB_PORT_PKEY_NOT_VALID) { >>> + get_pkey_and_subnet_prefix(&pps->alt, >>> + &pkey, >>> + &subnet_prefix); >>> + >>> + ret = enforce_qp_pkey_security(pkey, >>> + subnet_prefix, >>> + sec); >>> + } >>> + >>> + if (ret) >>> + goto out; >> The above if/goto is unnecessary. > > Right. > > Paul, do you want me to fix this with a new patch? Since this isn't a build or runtime failure, just a style correction, I'll leave it up to you: either post a 10/9 patch which converts all the jumps-to-return to just return, or respin/resubmit the patches. If you do the latter, just resubmit the affected patches and not the whole patchset. -- paul moore www.paul-moore.com -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html