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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 97471C433ED for ; Fri, 30 Apr 2021 05:54:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E9AC61459 for ; Fri, 30 Apr 2021 05:54:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230291AbhD3Fyy (ORCPT ); Fri, 30 Apr 2021 01:54:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:46214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbhD3Fyy (ORCPT ); Fri, 30 Apr 2021 01:54:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 32AF4613F8; Fri, 30 Apr 2021 05:54:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1619762046; bh=xB6d39Jap5GUTc+BZc5CdKX7iBo8WVlHU8Iqku980FU=; h=Date:From:To:Subject:In-Reply-To:From; b=pBFIyleNbA0kGe85SA+4JP9KXbswNlJ4TwQn02s1m240nAXO10TWacQkw+BG4mTqx UloiABIkn9yFRnhOYlB9KCEnMxNbktVV2D30bAlFG3LBrfa4nmE4PUYA7EJx2tareo a7TuaY7lJZoPEO+xue5j0Tm+ZkMwVz7Z+l2I1MIo= Date: Thu, 29 Apr 2021 22:54:05 -0700 From: Andrew Morton To: akpm@linux-foundation.org, gechangwei@live.cn, ghe@suse.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com, junxiao.bi@oracle.com, linux-mm@kvack.org, mark@fasheh.com, mm-commits@vger.kernel.org, piaojun@huawei.com, torvalds@linux-foundation.org, wen.gang.wang@oracle.com Subject: [patch 017/178] ocfs2: map flags directly in flags_to_o2dlm() Message-ID: <20210430055405.LwzJsrSF5%akpm@linux-foundation.org> In-Reply-To: <20210429225251.02b6386d21b69255b4f6c163@linux-foundation.org> User-Agent: s-nail v14.8.16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org =46rom: Joseph Qi Subject: ocfs2: map flags directly in flags_to_o2dlm() Use macro map_flag() is tricky and coccicheck outputs the following warning: fs/ocfs2/stack_o2cb.c:69:5-16: Unneeded variable: "o2dlm_flags". So map flags directly in flags_to_o2dlm() to make coccicheck=C2=A0happy. And remove BUG_ON() here as well to simplify code since it runs well a long time. Link: https://lkml.kernel.org/r/1616138664-35935-1-git-send-email-joseph.qi= @linux.alibaba.com Signed-off-by: Joseph Qi Reviewed-by: Wengang Wang Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Gang He Cc: Jun Piao Signed-off-by: Andrew Morton --- fs/ocfs2/stack_o2cb.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) --- a/fs/ocfs2/stack_o2cb.c~ocfs2-map-flags-directly-in-flags_to_o2dlm +++ a/fs/ocfs2/stack_o2cb.c @@ -59,31 +59,31 @@ static inline int mode_to_o2dlm(int mode return mode; } =20 -#define map_flag(_generic, _o2dlm) \ - if (flags & (_generic)) { \ - flags &=3D ~(_generic); \ - o2dlm_flags |=3D (_o2dlm); \ - } static int flags_to_o2dlm(u32 flags) { int o2dlm_flags =3D 0; =20 - map_flag(DLM_LKF_NOQUEUE, LKM_NOQUEUE); - map_flag(DLM_LKF_CANCEL, LKM_CANCEL); - map_flag(DLM_LKF_CONVERT, LKM_CONVERT); - map_flag(DLM_LKF_VALBLK, LKM_VALBLK); - map_flag(DLM_LKF_IVVALBLK, LKM_INVVALBLK); - map_flag(DLM_LKF_ORPHAN, LKM_ORPHAN); - map_flag(DLM_LKF_FORCEUNLOCK, LKM_FORCE); - map_flag(DLM_LKF_TIMEOUT, LKM_TIMEOUT); - map_flag(DLM_LKF_LOCAL, LKM_LOCAL); - - /* map_flag() should have cleared every flag passed in */ - BUG_ON(flags !=3D 0); + if (flags & DLM_LKF_NOQUEUE) + o2dlm_flags |=3D LKM_NOQUEUE; + if (flags & DLM_LKF_CANCEL) + o2dlm_flags |=3D LKM_CANCEL; + if (flags & DLM_LKF_CONVERT) + o2dlm_flags |=3D LKM_CONVERT; + if (flags & DLM_LKF_VALBLK) + o2dlm_flags |=3D LKM_VALBLK; + if (flags & DLM_LKF_IVVALBLK) + o2dlm_flags |=3D LKM_INVVALBLK; + if (flags & DLM_LKF_ORPHAN) + o2dlm_flags |=3D LKM_ORPHAN; + if (flags & DLM_LKF_FORCEUNLOCK) + o2dlm_flags |=3D LKM_FORCE; + if (flags & DLM_LKF_TIMEOUT) + o2dlm_flags |=3D LKM_TIMEOUT; + if (flags & DLM_LKF_LOCAL) + o2dlm_flags |=3D LKM_LOCAL; =20 return o2dlm_flags; } -#undef map_flag =20 /* * Map an o2dlm status to standard errno values. _