public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali@kernel.org>
To: Kyungmin Park <kmpark@infradead.org>, Heiko Schocher <hs@denx.de>
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	[thread overview]
Message-ID: <20220710113807.20942-1-pali@kernel.org> (raw)

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 <pali@kernel.org>
---
 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


             reply	other threads:[~2022-07-10 11:39 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-10 11:38 Pali Rohár [this message]
2022-07-10 11:38 ` [PATCH 2/2] ubifs: Use U-Boot assert() from <log.h> in UBI/UBIFS code Pali Rohár
2022-07-20  3:55   ` Heiko Schocher
2022-07-20  3:55 ` [PATCH 1/2] ubifs: Fix ubifs_assert_cmt_locked() Heiko Schocher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220710113807.20942-1-pali@kernel.org \
    --to=pali@kernel.org \
    --cc=hs@denx.de \
    --cc=kmpark@infradead.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox