Re: [PATCH] nvme-multipath: combine grpid and ANA state checks in nvme_parse_ana_log()

Christoph Hellwig
2021-06-08T05:23:30Z

On Tue, Jun 08, 2021 at 12:13:36PM +0800, Wu Bo wrote:
> - if (WARN_ON_ONCE(desc->grpid == 0))
> + if (WARN_ON_ONCE(desc->grpid == 0 ||
> + le32_to_cpu(desc->grpid) > ctrl->anagrpmax))
> return -EINVAL;
> - if (WARN_ON_ONCE(le32_to_cpu(desc->grpid) > ctrl->anagrpmax))
> - return -EINVAL;
> - if (WARN_ON_ONCE(desc->state == 0))
> - return -EINVAL;
> - if (WARN_ON_ONCE(desc->state > NVME_ANA_CHANGE))
> + if (WARN_ON_ONCE(desc->state == 0 ||
> + desc->state > NVME_ANA_CHANGE))

So besides making the code impossibl to read due to the incorrect
indentation this also makes each WARN_ON_ONCE cover multiple conditions.
Not very useful for debugging.