From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0ACC7C47082 for ; Tue, 8 Jun 2021 05:23:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E489C6124C for ; Tue, 8 Jun 2021 05:23:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230321AbhFHFZU (ORCPT ); Tue, 8 Jun 2021 01:25:20 -0400 Received: from verein.lst.de ([213.95.11.211]:49127 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230281AbhFHFZQ (ORCPT ); Tue, 8 Jun 2021 01:25:16 -0400 Received: by verein.lst.de (Postfix, from userid 2407) id E443E67373; Tue, 8 Jun 2021 07:23:20 +0200 (CEST) Date: Tue, 8 Jun 2021 07:23:20 +0200 From: Christoph Hellwig To: Wu Bo Cc: kbusch@kernel.org, axboe@fb.com, hch@lst.de, sagi@grimberg.me, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, linfeilong@huawei.com Subject: Re: [PATCH] nvme-multipath: combine grpid and ANA state checks in nvme_parse_ana_log() Message-ID: <20210608052320.GA13828@lst.de> References: <1623125616-629270-1-git-send-email-wubo40@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1623125616-629270-1-git-send-email-wubo40@huawei.com> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.