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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EDCFEC433EF for ; Sun, 10 Jul 2022 11:39:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ECE3F843A2; Sun, 10 Jul 2022 13:39:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="KjYU/96s"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4D6838435C; Sun, 10 Jul 2022 13:39:06 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8AD15843A2 for ; Sun, 10 Jul 2022 13:39:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 50357611E1; Sun, 10 Jul 2022 11:39:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 913DAC341C6; Sun, 10 Jul 2022 11:38:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657453139; bh=uiz/Fds2omVFW5/+sFk+f3YzCS86tcuwLKopj5hRoFo=; h=From:To:Cc:Subject:Date:From; b=KjYU/96s8CLLntF7whG+5BJj0evE17/YOYV6eI7xi5LQJmrcHWlpEe7PYCxD78IKW QdU5fZXQz5QJbScmniw8nb0CmEL2xqEuWLqb8PpEuQE45jrcrb1YYmHWm8dmeZuKRY 4uNMYLs7zay0tMemvCWN9KvIVVKg8orgEqom+BC+BIYlIskQG7Oh/IDYJ/OvoerIKe KJFTMAv8+o1sby3SPk+UI8+tlRizoZmyFF2kkXBYY+nHxfJexPkZR8AWsxWOmPb4SI z7Q72N/WRhhVlY0jgag4FYUvt/mDctzKwl/csmmotX3j2IlunwQeZI1zdTSk+Bvkxk zd8LoZrFfxtOQ== Received: by pali.im (Postfix) id 9958B77C; Sun, 10 Jul 2022 13:38:56 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Kyungmin Park , Heiko Schocher Cc: u-boot@lists.denx.de Subject: [PATCH 1/2] ubifs: Fix ubifs_assert_cmt_locked() Date: Sun, 10 Jul 2022 13:38:06 +0200 Message-Id: <20220710113807.20942-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean U-Boot does not implement down_write_trylock() and its stub always returns true that lock was acquired. Therefore ubifs_assert_cmt_locked() assert currently always fails. Fix this issue by redefining ubifs_assert_cmt_locked() to just empty stub as there is nothing to assert. Signed-off-by: Pali Rohár --- fs/ubifs/debug.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index 5f6e12702de8..d69f1e6ac70b 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -173,13 +173,7 @@ struct ubifs_global_debug_info { } \ } while (0) -#define ubifs_assert_cmt_locked(c) do { \ - if (unlikely(down_write_trylock(&(c)->commit_sem))) { \ - up_write(&(c)->commit_sem); \ - pr_debug("commit lock is not locked!\n"); \ - ubifs_assert(0); \ - } \ -} while (0) +#define ubifs_assert_cmt_locked(c) do { } while (0) #define ubifs_dbg_msg(type, fmt, ...) \ pr_debug("UBIFS DBG " type ": " fmt "\n", \ -- 2.20.1